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/OSSupport/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'tests/OSSupport/CMakeLists.txt') diff --git a/tests/OSSupport/CMakeLists.txt b/tests/OSSupport/CMakeLists.txt index 9d481ce09..bbe58732f 100644 --- a/tests/OSSupport/CMakeLists.txt +++ b/tests/OSSupport/CMakeLists.txt @@ -1,17 +1,17 @@ find_package(Threads REQUIRED) -include_directories(${CMAKE_SOURCE_DIR}/src/) +include_directories(${PROJECT_SOURCE_DIR}/src/) # Create a single OSSupport library that contains all the OSSupport code used in the tests: set (OSSupport_SRCS - ${CMAKE_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/Event.cpp - ${CMAKE_SOURCE_DIR}/src/StringUtils.cpp + ${PROJECT_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp + ${PROJECT_SOURCE_DIR}/src/OSSupport/Event.cpp + ${PROJECT_SOURCE_DIR}/src/StringUtils.cpp ) set (OSSupport_HDRS - ${CMAKE_SOURCE_DIR}/src/OSSupport/CriticalSection.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/Event.h - ${CMAKE_SOURCE_DIR}/src/StringUtils.h - ${CMAKE_SOURCE_DIR}/src/Globals.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/CriticalSection.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/Event.h + ${PROJECT_SOURCE_DIR}/src/StringUtils.h + ${PROJECT_SOURCE_DIR}/src/Globals.h ) add_library(OSSupport ${OSSupport_SRCS} -- cgit v1.2.3