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/Generating/CMakeLists.txt | 256 ++++++++++++++++++++-------------------- 1 file changed, 128 insertions(+), 128 deletions(-) (limited to 'tests/Generating') diff --git a/tests/Generating/CMakeLists.txt b/tests/Generating/CMakeLists.txt index ef121d3ee..ac8a9be42 100644 --- a/tests/Generating/CMakeLists.txt +++ b/tests/Generating/CMakeLists.txt @@ -1,139 +1,139 @@ -include_directories(${CMAKE_SOURCE_DIR}/src/) -include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/) -include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/lib/mbedtls/include) +include_directories(${PROJECT_SOURCE_DIR}/src/) +include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/lib/) +include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/lib/mbedtls/include) 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/BlockInfo.cpp - ${CMAKE_SOURCE_DIR}/src/BlockType.cpp - ${CMAKE_SOURCE_DIR}/src/Cuboid.cpp - ${CMAKE_SOURCE_DIR}/src/ChunkData.cpp - ${CMAKE_SOURCE_DIR}/src/Defines.cpp - ${CMAKE_SOURCE_DIR}/src/Enchantments.cpp - ${CMAKE_SOURCE_DIR}/src/FastRandom.cpp - ${CMAKE_SOURCE_DIR}/src/IniFile.cpp - ${CMAKE_SOURCE_DIR}/src/ProbabDistrib.cpp - ${CMAKE_SOURCE_DIR}/src/StringCompression.cpp - ${CMAKE_SOURCE_DIR}/src/StringUtils.cpp - ${CMAKE_SOURCE_DIR}/src/VoronoiMap.cpp - - ${CMAKE_SOURCE_DIR}/src/Bindings/LuaState.cpp # Needed for PrefabPiecePool loading - - ${CMAKE_SOURCE_DIR}/src/Noise/Noise.cpp - - ${CMAKE_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp # Needed for LuaState - ${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/BlockInfo.cpp + ${PROJECT_SOURCE_DIR}/src/BlockType.cpp + ${PROJECT_SOURCE_DIR}/src/Cuboid.cpp + ${PROJECT_SOURCE_DIR}/src/ChunkData.cpp + ${PROJECT_SOURCE_DIR}/src/Defines.cpp + ${PROJECT_SOURCE_DIR}/src/Enchantments.cpp + ${PROJECT_SOURCE_DIR}/src/FastRandom.cpp + ${PROJECT_SOURCE_DIR}/src/IniFile.cpp + ${PROJECT_SOURCE_DIR}/src/ProbabDistrib.cpp + ${PROJECT_SOURCE_DIR}/src/StringCompression.cpp + ${PROJECT_SOURCE_DIR}/src/StringUtils.cpp + ${PROJECT_SOURCE_DIR}/src/VoronoiMap.cpp + + ${PROJECT_SOURCE_DIR}/src/Bindings/LuaState.cpp # Needed for PrefabPiecePool loading + + ${PROJECT_SOURCE_DIR}/src/Noise/Noise.cpp + + ${PROJECT_SOURCE_DIR}/src/OSSupport/CriticalSection.cpp # Needed for LuaState + ${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 (GENERATING_SRCS - ${CMAKE_SOURCE_DIR}/src/Generating/BioGen.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/Caves.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/ChunkDesc.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/ChunkGenerator.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/CompoGen.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/CompoGenBiomal.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/ComposableGenerator.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/DistortedHeightmap.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/DungeonRoomsFinisher.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/EndGen.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/FinishGen.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/GridStructGen.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/HeiGen.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/MineShafts.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/Noise3DGenerator.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/PieceGeneratorBFSTree.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/PiecePool.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/PieceStructuresGen.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/Prefab.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/PrefabPiecePool.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/PrefabStructure.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/Ravines.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/RoughRavines.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/SinglePieceStructuresGen.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/StructGen.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/Trees.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/TwoHeights.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/VerticalLimit.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/VerticalStrategy.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/VillageGen.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/BioGen.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/Caves.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/ChunkDesc.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/ChunkGenerator.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/CompoGen.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/CompoGenBiomal.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/ComposableGenerator.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/DistortedHeightmap.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/DungeonRoomsFinisher.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/EndGen.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/FinishGen.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/GridStructGen.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/HeiGen.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/MineShafts.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/Noise3DGenerator.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/PieceGeneratorBFSTree.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/PiecePool.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/PieceStructuresGen.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/Prefab.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/PrefabPiecePool.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/PrefabStructure.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/Ravines.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/RoughRavines.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/SinglePieceStructuresGen.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/StructGen.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/Trees.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/TwoHeights.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/VerticalLimit.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/VerticalStrategy.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/VillageGen.cpp ) set (SHARED_HDRS - ${CMAKE_SOURCE_DIR}/src/BiomeDef.h - ${CMAKE_SOURCE_DIR}/src/BlockArea.h - ${CMAKE_SOURCE_DIR}/src/BlockInfo.h - ${CMAKE_SOURCE_DIR}/src/BlockType.h - ${CMAKE_SOURCE_DIR}/src/Cuboid.h - ${CMAKE_SOURCE_DIR}/src/ChunkData.h - ${CMAKE_SOURCE_DIR}/src/ChunkDef.h - ${CMAKE_SOURCE_DIR}/src/Defines.h - ${CMAKE_SOURCE_DIR}/src/Enchantments.h - ${CMAKE_SOURCE_DIR}/src/FastRandom.h - ${CMAKE_SOURCE_DIR}/src/Globals.h - ${CMAKE_SOURCE_DIR}/src/IniFile.h - ${CMAKE_SOURCE_DIR}/src/ProbabDistrib.h - ${CMAKE_SOURCE_DIR}/src/StringCompression.h - ${CMAKE_SOURCE_DIR}/src/StringUtils.h - ${CMAKE_SOURCE_DIR}/src/VoronoiMap.h - - ${CMAKE_SOURCE_DIR}/src/Bindings/LuaState.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/BlockInfo.h + ${PROJECT_SOURCE_DIR}/src/BlockType.h + ${PROJECT_SOURCE_DIR}/src/Cuboid.h + ${PROJECT_SOURCE_DIR}/src/ChunkData.h + ${PROJECT_SOURCE_DIR}/src/ChunkDef.h + ${PROJECT_SOURCE_DIR}/src/Defines.h + ${PROJECT_SOURCE_DIR}/src/Enchantments.h + ${PROJECT_SOURCE_DIR}/src/FastRandom.h + ${PROJECT_SOURCE_DIR}/src/Globals.h + ${PROJECT_SOURCE_DIR}/src/IniFile.h + ${PROJECT_SOURCE_DIR}/src/ProbabDistrib.h + ${PROJECT_SOURCE_DIR}/src/StringCompression.h + ${PROJECT_SOURCE_DIR}/src/StringUtils.h + ${PROJECT_SOURCE_DIR}/src/VoronoiMap.h + + ${PROJECT_SOURCE_DIR}/src/Bindings/LuaState.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 (GENERATING_HDRS - ${CMAKE_SOURCE_DIR}/src/Generating/BioGen.h - ${CMAKE_SOURCE_DIR}/src/Generating/Caves.h - ${CMAKE_SOURCE_DIR}/src/Generating/ChunkDesc.h - ${CMAKE_SOURCE_DIR}/src/Generating/ChunkGenerator.h - ${CMAKE_SOURCE_DIR}/src/Generating/CompoGen.h - ${CMAKE_SOURCE_DIR}/src/Generating/CompoGenBiomal.h - ${CMAKE_SOURCE_DIR}/src/Generating/ComposableGenerator.h - ${CMAKE_SOURCE_DIR}/src/Generating/CompositedHeiGen.h - ${CMAKE_SOURCE_DIR}/src/Generating/DistortedHeightmap.h - ${CMAKE_SOURCE_DIR}/src/Generating/DungeonRoomsFinisher.h - ${CMAKE_SOURCE_DIR}/src/Generating/EndGen.h - ${CMAKE_SOURCE_DIR}/src/Generating/FinishGen.h - ${CMAKE_SOURCE_DIR}/src/Generating/GridStructGen.h - ${CMAKE_SOURCE_DIR}/src/Generating/HeiGen.h - ${CMAKE_SOURCE_DIR}/src/Generating/IntGen.h - ${CMAKE_SOURCE_DIR}/src/Generating/MineShafts.h - ${CMAKE_SOURCE_DIR}/src/Generating/Noise3DGenerator.h - ${CMAKE_SOURCE_DIR}/src/Generating/PieceGeneratorBFSTree.h - ${CMAKE_SOURCE_DIR}/src/Generating/PiecePool.h - ${CMAKE_SOURCE_DIR}/src/Generating/PieceStructuresGen.h - ${CMAKE_SOURCE_DIR}/src/Generating/Prefab.h - ${CMAKE_SOURCE_DIR}/src/Generating/PrefabPiecePool.h - ${CMAKE_SOURCE_DIR}/src/Generating/PrefabStructure.h - ${CMAKE_SOURCE_DIR}/src/Generating/ProtIntGen.h - ${CMAKE_SOURCE_DIR}/src/Generating/Ravines.h - ${CMAKE_SOURCE_DIR}/src/Generating/RoughRavines.h - ${CMAKE_SOURCE_DIR}/src/Generating/ShapeGen.cpp - ${CMAKE_SOURCE_DIR}/src/Generating/SinglePieceStructuresGen.h - ${CMAKE_SOURCE_DIR}/src/Generating/StructGen.h - ${CMAKE_SOURCE_DIR}/src/Generating/Trees.h - ${CMAKE_SOURCE_DIR}/src/Generating/TwoHeights.h - ${CMAKE_SOURCE_DIR}/src/Generating/VerticalLimit.h - ${CMAKE_SOURCE_DIR}/src/Generating/VerticalStrategy.h - ${CMAKE_SOURCE_DIR}/src/Generating/VillageGen.h + ${PROJECT_SOURCE_DIR}/src/Generating/BioGen.h + ${PROJECT_SOURCE_DIR}/src/Generating/Caves.h + ${PROJECT_SOURCE_DIR}/src/Generating/ChunkDesc.h + ${PROJECT_SOURCE_DIR}/src/Generating/ChunkGenerator.h + ${PROJECT_SOURCE_DIR}/src/Generating/CompoGen.h + ${PROJECT_SOURCE_DIR}/src/Generating/CompoGenBiomal.h + ${PROJECT_SOURCE_DIR}/src/Generating/ComposableGenerator.h + ${PROJECT_SOURCE_DIR}/src/Generating/CompositedHeiGen.h + ${PROJECT_SOURCE_DIR}/src/Generating/DistortedHeightmap.h + ${PROJECT_SOURCE_DIR}/src/Generating/DungeonRoomsFinisher.h + ${PROJECT_SOURCE_DIR}/src/Generating/EndGen.h + ${PROJECT_SOURCE_DIR}/src/Generating/FinishGen.h + ${PROJECT_SOURCE_DIR}/src/Generating/GridStructGen.h + ${PROJECT_SOURCE_DIR}/src/Generating/HeiGen.h + ${PROJECT_SOURCE_DIR}/src/Generating/IntGen.h + ${PROJECT_SOURCE_DIR}/src/Generating/MineShafts.h + ${PROJECT_SOURCE_DIR}/src/Generating/Noise3DGenerator.h + ${PROJECT_SOURCE_DIR}/src/Generating/PieceGeneratorBFSTree.h + ${PROJECT_SOURCE_DIR}/src/Generating/PiecePool.h + ${PROJECT_SOURCE_DIR}/src/Generating/PieceStructuresGen.h + ${PROJECT_SOURCE_DIR}/src/Generating/Prefab.h + ${PROJECT_SOURCE_DIR}/src/Generating/PrefabPiecePool.h + ${PROJECT_SOURCE_DIR}/src/Generating/PrefabStructure.h + ${PROJECT_SOURCE_DIR}/src/Generating/ProtIntGen.h + ${PROJECT_SOURCE_DIR}/src/Generating/Ravines.h + ${PROJECT_SOURCE_DIR}/src/Generating/RoughRavines.h + ${PROJECT_SOURCE_DIR}/src/Generating/ShapeGen.cpp + ${PROJECT_SOURCE_DIR}/src/Generating/SinglePieceStructuresGen.h + ${PROJECT_SOURCE_DIR}/src/Generating/StructGen.h + ${PROJECT_SOURCE_DIR}/src/Generating/Trees.h + ${PROJECT_SOURCE_DIR}/src/Generating/TwoHeights.h + ${PROJECT_SOURCE_DIR}/src/Generating/VerticalLimit.h + ${PROJECT_SOURCE_DIR}/src/Generating/VerticalStrategy.h + ${PROJECT_SOURCE_DIR}/src/Generating/VillageGen.h ) set (STUBS @@ -169,11 +169,11 @@ source_group("Generating" FILES ${GENERATING_HDRS} ${GENERATING_SRCS}) # BasicGeneratingTest: add_executable(BasicGeneratorTest BasicGeneratorTest.cpp - ${CMAKE_SOURCE_DIR}/src/IniFile.cpp - ${CMAKE_SOURCE_DIR}/src/mbedTLS++/Sha1Checksum.cpp + ${PROJECT_SOURCE_DIR}/src/IniFile.cpp + ${PROJECT_SOURCE_DIR}/src/mbedTLS++/Sha1Checksum.cpp ) target_link_libraries(BasicGeneratorTest GeneratorTestingSupport mbedtls) -file(COPY "${CMAKE_SOURCE_DIR}/Server/items.ini" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") +file(COPY "${PROJECT_SOURCE_DIR}/Server/items.ini" DESTINATION "${CMAKE_CURRENT_BINARY_DIR}") add_test( NAME BasicGeneratorTest COMMAND BasicGeneratorTest @@ -223,7 +223,7 @@ add_executable(PieceGeneratorBFSTree target_link_libraries(PieceGeneratorBFSTree GeneratorTestingSupport) add_test( NAME PieceGeneratorBFSTree-test - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/Server/Prefabs/PieceStructures + WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/Server/Prefabs/PieceStructures COMMAND PieceGeneratorBFSTree ) -- cgit v1.2.3