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/LuaThreadStress/CMakeLists.txt | 114 +++++++++++++++++------------------ 1 file changed, 57 insertions(+), 57 deletions(-) (limited to 'tests/LuaThreadStress/CMakeLists.txt') diff --git a/tests/LuaThreadStress/CMakeLists.txt b/tests/LuaThreadStress/CMakeLists.txt index 34e6836ec..32ff4b32e 100644 --- a/tests/LuaThreadStress/CMakeLists.txt +++ b/tests/LuaThreadStress/CMakeLists.txt @@ -1,67 +1,67 @@ find_package(Threads REQUIRED) -include_directories(${CMAKE_SOURCE_DIR}/src/) -include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/) +include_directories(${PROJECT_SOURCE_DIR}/src/) +include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/lib/) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) set (SHARED_SRCS - ${CMAKE_SOURCE_DIR}/src/BiomeDef.cpp - ${CMAKE_SOURCE_DIR}/src/BlockArea.cpp - ${CMAKE_SOURCE_DIR}/src/Cuboid.cpp - ${CMAKE_SOURCE_DIR}/src/ChunkData.cpp - ${CMAKE_SOURCE_DIR}/src/StringCompression.cpp - ${CMAKE_SOURCE_DIR}/src/StringUtils.cpp - - ${CMAKE_SOURCE_DIR}/src/Bindings/LuaState.cpp - - ${CMAKE_SOURCE_DIR}/src/Generating/ChunkDesc.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/PiecePool.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/Prefab.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/PrefabPiecePool.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/VerticalLimit.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/VerticalStrategy.cpp - - ${CMAKE_SOURCE_DIR}/src/Noise/Noise.cpp - - ${CMAKE_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/Event.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/File.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/GZipFile.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.cpp - ${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.cpp - - ${CMAKE_SOURCE_DIR}/src/WorldStorage/FastNBT.cpp - ${CMAKE_SOURCE_DIR}/src/WorldStorage/SchematicFileSerializer.cpp + ${PROJECT_SOURCE_DIR}/src/BiomeDef.cpp + ${PROJECT_SOURCE_DIR}/src/BlockArea.cpp + ${PROJECT_SOURCE_DIR}/src/Cuboid.cpp + ${PROJECT_SOURCE_DIR}/src/ChunkData.cpp + ${PROJECT_SOURCE_DIR}/src/StringCompression.cpp + ${PROJECT_SOURCE_DIR}/src/StringUtils.cpp + + ${PROJECT_SOURCE_DIR}/src/Bindings/LuaState.cpp + + ${PROJECT_SOURCE_DIR}/src/Generating/ChunkDesc.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/PiecePool.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/Prefab.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/PrefabPiecePool.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/VerticalLimit.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/VerticalStrategy.cpp + + ${PROJECT_SOURCE_DIR}/src/Noise/Noise.cpp + + ${PROJECT_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp + ${PROJECT_SOURCE_DIR}/src/OSSupport/Event.cpp + ${PROJECT_SOURCE_DIR}/src/OSSupport/File.cpp + ${PROJECT_SOURCE_DIR}/src/OSSupport/GZipFile.cpp + ${PROJECT_SOURCE_DIR}/src/OSSupport/StackTrace.cpp + ${PROJECT_SOURCE_DIR}/src/OSSupport/WinStackWalker.cpp + + ${PROJECT_SOURCE_DIR}/src/WorldStorage/FastNBT.cpp + ${PROJECT_SOURCE_DIR}/src/WorldStorage/SchematicFileSerializer.cpp ) set (SHARED_HDRS - ${CMAKE_SOURCE_DIR}/src/BiomeDef.h - ${CMAKE_SOURCE_DIR}/src/BlockArea.h - ${CMAKE_SOURCE_DIR}/src/Cuboid.h - ${CMAKE_SOURCE_DIR}/src/ChunkData.h - ${CMAKE_SOURCE_DIR}/src/Globals.h - ${CMAKE_SOURCE_DIR}/src/StringCompression.h - ${CMAKE_SOURCE_DIR}/src/StringUtils.h - - ${CMAKE_SOURCE_DIR}/src/Bindings/LuaState.h - - ${CMAKE_SOURCE_DIR}/src/Generating/ChunkDesc.h - ${CMAKE_SOURCE_DIR}/src/Generating/PiecePool.h - ${CMAKE_SOURCE_DIR}/src/Generating/Prefab.h - ${CMAKE_SOURCE_DIR}/src/Generating/PrefabPiecePool.h - ${CMAKE_SOURCE_DIR}/src/Generating/VerticalLimit.h - ${CMAKE_SOURCE_DIR}/src/Generating/VerticalStrategy.h - - ${CMAKE_SOURCE_DIR}/src/Noise/Noise.h - - ${CMAKE_SOURCE_DIR}/src/OSSupport/CriticalSection.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/Event.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/File.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/GZipFile.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/StackTrace.h - ${CMAKE_SOURCE_DIR}/src/OSSupport/WinStackWalker.h - - ${CMAKE_SOURCE_DIR}/src/WorldStorage/FastNBT.h - ${CMAKE_SOURCE_DIR}/src/WorldStorage/SchematicFileSerializer.h + ${PROJECT_SOURCE_DIR}/src/BiomeDef.h + ${PROJECT_SOURCE_DIR}/src/BlockArea.h + ${PROJECT_SOURCE_DIR}/src/Cuboid.h + ${PROJECT_SOURCE_DIR}/src/ChunkData.h + ${PROJECT_SOURCE_DIR}/src/Globals.h + ${PROJECT_SOURCE_DIR}/src/StringCompression.h + ${PROJECT_SOURCE_DIR}/src/StringUtils.h + + ${PROJECT_SOURCE_DIR}/src/Bindings/LuaState.h + + ${PROJECT_SOURCE_DIR}/src/Generating/ChunkDesc.h + ${PROJECT_SOURCE_DIR}/src/Generating/PiecePool.h + ${PROJECT_SOURCE_DIR}/src/Generating/Prefab.h + ${PROJECT_SOURCE_DIR}/src/Generating/PrefabPiecePool.h + ${PROJECT_SOURCE_DIR}/src/Generating/VerticalLimit.h + ${PROJECT_SOURCE_DIR}/src/Generating/VerticalStrategy.h + + ${PROJECT_SOURCE_DIR}/src/Noise/Noise.h + + ${PROJECT_SOURCE_DIR}/src/OSSupport/CriticalSection.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/Event.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/File.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/GZipFile.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/StackTrace.h + ${PROJECT_SOURCE_DIR}/src/OSSupport/WinStackWalker.h + + ${PROJECT_SOURCE_DIR}/src/WorldStorage/FastNBT.h + ${PROJECT_SOURCE_DIR}/src/WorldStorage/SchematicFileSerializer.h ) set (SRCS -- cgit v1.2.3