diff options
| author | Tiger Wang <ziwei.tiger@outlook.com> | 2020-05-22 00:52:19 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@outlook.com> | 2020-07-12 23:00:07 +0200 |
| commit | 6317176d7e890292cb40d6add96a1c81e8eeb08f (patch) | |
| tree | 6660c0df2d36933c2abe88e8f949eb552cf63c1e /Tools | |
| parent | Remove Schematic Chunk height limitation (diff) | |
| download | cuberite-6317176d7e890292cb40d6add96a1c81e8eeb08f.tar cuberite-6317176d7e890292cb40d6add96a1c81e8eeb08f.tar.gz cuberite-6317176d7e890292cb40d6add96a1c81e8eeb08f.tar.bz2 cuberite-6317176d7e890292cb40d6add96a1c81e8eeb08f.tar.lz cuberite-6317176d7e890292cb40d6add96a1c81e8eeb08f.tar.xz cuberite-6317176d7e890292cb40d6add96a1c81e8eeb08f.tar.zst cuberite-6317176d7e890292cb40d6add96a1c81e8eeb08f.zip | |
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/AnvilStats/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | Tools/GrownBiomeGenVisualiser/CMakeLists.txt | 14 | ||||
| -rw-r--r-- | Tools/MCADefrag/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | Tools/NoiseSpeedTest/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | Tools/ProtoProxy/CMakeLists.txt | 9 |
5 files changed, 6 insertions, 39 deletions
diff --git a/Tools/AnvilStats/CMakeLists.txt b/Tools/AnvilStats/CMakeLists.txt index 865414a6d..a5cf4b9e7 100644 --- a/Tools/AnvilStats/CMakeLists.txt +++ b/Tools/AnvilStats/CMakeLists.txt @@ -2,10 +2,6 @@ project (AnvilStats) include(../../SetFlags.cmake) -set_flags() -set_lib_flags() - - # Set include paths to the used libraries: include_directories("../../lib") include_directories("../../src") @@ -23,8 +19,6 @@ endfunction() add_subdirectory(../../lib/zlib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/lib/zlib) -set_exe_flags() - # Include the shared files: set(SHARED_SRC ../../src/ByteBuffer.cpp diff --git a/Tools/GrownBiomeGenVisualiser/CMakeLists.txt b/Tools/GrownBiomeGenVisualiser/CMakeLists.txt index c3fa4ac32..ed8cd5d1d 100644 --- a/Tools/GrownBiomeGenVisualiser/CMakeLists.txt +++ b/Tools/GrownBiomeGenVisualiser/CMakeLists.txt @@ -1,13 +1,7 @@ project (GrownBiomeGenVisualiser) - -# Without this, the MSVC variable isn't defined for MSVC builds ( https://www.cmake.org/pipermail/cmake/2011-November/047130.html ) -enable_language(CXX C) +find_package(Threads REQUIRED) include(../../SetFlags.cmake) -set_flags() -set_lib_flags() -enable_profile() - # Set include paths to the used libraries: include_directories(SYSTEM "../../lib") @@ -24,10 +18,6 @@ function(flatten_files arg1) endfunction() -# Include the libraries: - -set_exe_flags() - # Include the shared files: set(SHARED_SRC ../../src/StringUtils.cpp @@ -89,6 +79,6 @@ add_executable(GrownBiomeGenVisualiser ${SHARED_OSS_HDR} ) -target_link_libraries(GrownBiomeGenVisualiser fmt::fmt) +target_link_libraries(GrownBiomeGenVisualiser fmt::fmt Threads::Threads) set_target_properties(GrownBiomeGenVisualiser PROPERTIES FOLDER Tools) diff --git a/Tools/MCADefrag/CMakeLists.txt b/Tools/MCADefrag/CMakeLists.txt index 05b7ff8bc..b093a759b 100644 --- a/Tools/MCADefrag/CMakeLists.txt +++ b/Tools/MCADefrag/CMakeLists.txt @@ -1,13 +1,8 @@ cmake_minimum_required(VERSION 3.13) project (MCADefrag) - -# Without this, the MSVC variable isn't defined for MSVC builds ( https://www.cmake.org/pipermail/cmake/2011-November/047130.html ) -enable_language(CXX C) +find_package(Threads REQUIRED) include(../../SetFlags.cmake) -set_flags() -set_lib_flags() -enable_profile() # Set include paths to the used libraries: include_directories(SYSTEM "../../lib") @@ -28,8 +23,6 @@ endfunction() add_subdirectory(../../lib/zlib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/lib/zlib) -set_exe_flags() - # Include the shared files: set(SHARED_SRC ../../src/StringCompression.cpp @@ -93,4 +86,4 @@ add_executable(MCADefrag ${SHARED_OSS_HDR} ) -target_link_libraries(MCADefrag zlib fmt::fmt) +target_link_libraries(MCADefrag zlib fmt::fmt Threads::Threads) diff --git a/Tools/NoiseSpeedTest/CMakeLists.txt b/Tools/NoiseSpeedTest/CMakeLists.txt index b451a61d3..f207cead3 100644 --- a/Tools/NoiseSpeedTest/CMakeLists.txt +++ b/Tools/NoiseSpeedTest/CMakeLists.txt @@ -1,16 +1,11 @@ project (NoiseSpeedTest) include(../../SetFlags.cmake) -set_flags() -set_lib_flags() -enable_profile() # Set include paths to the used libraries: include_directories(SYSTEM "../../lib") include_directories("../../src") -set_exe_flags() - # Include the shared files: set(SHARED_SRC ../../src/Logger.cpp diff --git a/Tools/ProtoProxy/CMakeLists.txt b/Tools/ProtoProxy/CMakeLists.txt index 431c29daa..8f3228a47 100644 --- a/Tools/ProtoProxy/CMakeLists.txt +++ b/Tools/ProtoProxy/CMakeLists.txt @@ -1,11 +1,8 @@ project (ProtoProxy) +find_package(Threads REQUIRED) include(../../SetFlags.cmake) -set_flags() -set_lib_flags() - - # Set include paths to the used libraries: include_directories(SYSTEM "../../lib") include_directories(SYSTEM "../../lib/mbedtls/include") @@ -22,8 +19,6 @@ endfunction() add_subdirectory(../../lib/zlib ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_FILES_DIRECTORY}/lib/zlib) -set_exe_flags() - # Include the shared files: set(SHARED_SRC ../../src/ByteBuffer.cpp @@ -99,5 +94,5 @@ add_executable(ProtoProxy ${SHARED_OSS_HDR} ) -target_link_libraries(ProtoProxy zlib mbedtls fmt::fmt) +target_link_libraries(ProtoProxy zlib mbedtls fmt::fmt Threads::Threads) |