From a145980795a4f37ebb9857bddb7427a184bbd6dd Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Thu, 15 Oct 2020 10:35:44 +0100 Subject: Fix Android builds (#4998) Construct paths relative to the Cuberite sources with PROJECT_SOURCE_DIR, instead of wherever the first CMakeLists.txt file happened to be with CMAKE_SOURCE_DIR. In Android's case, the latter was in a folder called android/ but that's not the root of the source tree, so any file path built off that root was wrong. This caused file-specific warnings exclusions to fail to apply. --- tests/CompositeChat/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/CompositeChat/CMakeLists.txt') diff --git a/tests/CompositeChat/CMakeLists.txt b/tests/CompositeChat/CMakeLists.txt index 78847c443..7bb65cfe7 100644 --- a/tests/CompositeChat/CMakeLists.txt +++ b/tests/CompositeChat/CMakeLists.txt @@ -1,18 +1,18 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}) -include_directories(${CMAKE_SOURCE_DIR}/src/) -include_directories(${CMAKE_SOURCE_DIR}/lib/jsoncpp/include) +include_directories(${PROJECT_SOURCE_DIR}/src/) +include_directories(${PROJECT_SOURCE_DIR}/lib/jsoncpp/include) set (SHARED_SRCS - ${CMAKE_SOURCE_DIR}/src/CompositeChat.cpp - ${CMAKE_SOURCE_DIR}/src/JsonUtils.cpp - ${CMAKE_SOURCE_DIR}/src/StringUtils.cpp + ${PROJECT_SOURCE_DIR}/src/CompositeChat.cpp + ${PROJECT_SOURCE_DIR}/src/JsonUtils.cpp + ${PROJECT_SOURCE_DIR}/src/StringUtils.cpp ) set (SHARED_HDRS ../TestHelpers.h - ${CMAKE_SOURCE_DIR}/src/CompositeChat.h - ${CMAKE_SOURCE_DIR}/src/JsonUtils.h - ${CMAKE_SOURCE_DIR}/src/StringUtils.h + ${PROJECT_SOURCE_DIR}/src/CompositeChat.h + ${PROJECT_SOURCE_DIR}/src/JsonUtils.h + ${PROJECT_SOURCE_DIR}/src/StringUtils.h ) set (SRCS -- cgit v1.2.3