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/Network/CMakeLists.txt | 84 ++++++++++++++++++++++---------------------- 1 file changed, 42 insertions(+), 42 deletions(-) (limited to 'tests/Network') diff --git a/tests/Network/CMakeLists.txt b/tests/Network/CMakeLists.txt index 8bbe6294d..1954afc58 100644 --- a/tests/Network/CMakeLists.txt +++ b/tests/Network/CMakeLists.txt @@ -1,53 +1,53 @@ -include_directories(${CMAKE_SOURCE_DIR}/src/) -include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/mbedtls/include) +include_directories(${PROJECT_SOURCE_DIR}/src/) +include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/lib/mbedtls/include) find_package(Threads REQUIRED) # Create a single Network library that contains all the networking code: set (Network_SRCS - ${CMAKE_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/Event.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/HostnameLookup.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/IPLookup.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/IsThread.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/NetworkInterfaceEnum.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/NetworkLookup.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/NetworkSingleton.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/ServerHandleImpl.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/TCPLinkImpl.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.cpp - ${CMAKE_SOURCE_DIR}/src/mbedTLS++/CtrDrbgContext.cpp - ${CMAKE_SOURCE_DIR}/src/mbedTLS++/CryptoKey.cpp - ${CMAKE_SOURCE_DIR}/src/mbedTLS++/EntropyContext.cpp - ${CMAKE_SOURCE_DIR}/src/mbedTLS++/SslConfig.cpp - ${CMAKE_SOURCE_DIR}/src/mbedTLS++/SslContext.cpp - ${CMAKE_SOURCE_DIR}/src/mbedTLS++/X509Cert.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/OSSupport/HostnameLookup.cpp + ${PROJECT_SOURCE_DIR}/src/OSSupport/IPLookup.cpp + ${PROJECT_SOURCE_DIR}/src/OSSupport/IsThread.cpp + ${PROJECT_SOURCE_DIR}/src/OSSupport/NetworkInterfaceEnum.cpp + ${PROJECT_SOURCE_DIR}/src/OSSupport/NetworkLookup.cpp + ${PROJECT_SOURCE_DIR}/src/OSSupport/NetworkSingleton.cpp + ${PROJECT_SOURCE_DIR}/src/OSSupport/ServerHandleImpl.cpp + ${PROJECT_SOURCE_DIR}/src/OSSupport/StackTrace.cpp + ${PROJECT_SOURCE_DIR}/src/OSSupport/TCPLinkImpl.cpp + ${PROJECT_SOURCE_DIR}/src/OSSupport/WinStackWalker.cpp + ${PROJECT_SOURCE_DIR}/src/mbedTLS++/CtrDrbgContext.cpp + ${PROJECT_SOURCE_DIR}/src/mbedTLS++/CryptoKey.cpp + ${PROJECT_SOURCE_DIR}/src/mbedTLS++/EntropyContext.cpp + ${PROJECT_SOURCE_DIR}/src/mbedTLS++/SslConfig.cpp + ${PROJECT_SOURCE_DIR}/src/mbedTLS++/SslContext.cpp + ${PROJECT_SOURCE_DIR}/src/mbedTLS++/X509Cert.cpp + ${PROJECT_SOURCE_DIR}/src/StringUtils.cpp ) set (Network_HDRS - ${CMAKE_SOURCE_DIR}/src/OSSupport/CriticalSection.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/Event.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/GetAddressInfoError.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/HostnameLookup.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/IPLookup.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/IsThread.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/Network.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/NetworkLookup.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/NetworkSingleton.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/ServerHandleImpl.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/TCPLinkImpl.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/Queue.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.h - ${CMAKE_SOURCE_DIR}/src/mbedTLS++/CtrDrbgContext.h - ${CMAKE_SOURCE_DIR}/src/mbedTLS++/CryptoKey.h - ${CMAKE_SOURCE_DIR}/src/mbedTLS++/EntropyContext.h - ${CMAKE_SOURCE_DIR}/src/mbedTLS++/SslConfig.h - ${CMAKE_SOURCE_DIR}/src/mbedTLS++/SslContext.h - ${CMAKE_SOURCE_DIR}/src/mbedTLS++/X509Cert.h - ${CMAKE_SOURCE_DIR}/src/StringUtils.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/CriticalSection.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/Event.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/GetAddressInfoError.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/HostnameLookup.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/IPLookup.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/IsThread.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/Network.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/NetworkLookup.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/NetworkSingleton.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/ServerHandleImpl.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/StackTrace.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/TCPLinkImpl.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/Queue.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/WinStackWalker.h + ${PROJECT_SOURCE_DIR}/src/mbedTLS++/CtrDrbgContext.h + ${PROJECT_SOURCE_DIR}/src/mbedTLS++/CryptoKey.h + ${PROJECT_SOURCE_DIR}/src/mbedTLS++/EntropyContext.h + ${PROJECT_SOURCE_DIR}/src/mbedTLS++/SslConfig.h + ${PROJECT_SOURCE_DIR}/src/mbedTLS++/SslContext.h + ${PROJECT_SOURCE_DIR}/src/mbedTLS++/X509Cert.h + ${PROJECT_SOURCE_DIR}/src/StringUtils.h ) add_library(Network -- cgit v1.2.3