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/UUID/CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/UUID/CMakeLists.txt') diff --git a/tests/UUID/CMakeLists.txt b/tests/UUID/CMakeLists.txt index f1d61e4a1..a99d53fb5 100644 --- a/tests/UUID/CMakeLists.txt +++ b/tests/UUID/CMakeLists.txt @@ -1,11 +1,11 @@ set (SHARED_SRCS - ${CMAKE_SOURCE_DIR}/src/UUID.cpp - ${CMAKE_SOURCE_DIR}/src/StringUtils.cpp + ${PROJECT_SOURCE_DIR}/src/UUID.cpp + ${PROJECT_SOURCE_DIR}/src/StringUtils.cpp ) set (SHARED_HDRS - ${CMAKE_SOURCE_DIR}/src/UUID.h - ${CMAKE_SOURCE_DIR}/src/StringUtils.h + ${PROJECT_SOURCE_DIR}/src/UUID.h + ${PROJECT_SOURCE_DIR}/src/StringUtils.h ) set (SRCS @@ -19,8 +19,8 @@ add_executable(UUIDTest ${SRCS} ${SHARED_SRCS} ${SHARED_HDRS}) target_link_libraries(UUIDTest mbedcrypto fmt::fmt) target_compile_definitions(UUIDTest PRIVATE TEST_GLOBALS=1) target_include_directories(UUIDTest PRIVATE - ${CMAKE_SOURCE_DIR}/src/ - ${CMAKE_SOURCE_DIR}/lib/mbedtls/include + ${PROJECT_SOURCE_DIR}/src/ + ${PROJECT_SOURCE_DIR}/lib/mbedtls/include ) add_test(NAME UUID-test COMMAND UUIDTest) -- cgit v1.2.3