diff options
| author | ljfa-ag <ljfa-ag@web.de> | 2015-09-14 21:03:37 +0200 |
|---|---|---|
| committer | ljfa-ag <ljfa-ag@web.de> | 2015-09-14 21:05:42 +0200 |
| commit | ab346593cab00bc000cb34819f3784580d21e6d7 (patch) | |
| tree | 2291de375581489cf927b06508efdf3b6657b52a | |
| parent | 0f7e89cfce630788e01a9a58467a0ab8bf252681 (diff) | |
| download | Project-Tick-ab346593cab00bc000cb34819f3784580d21e6d7.tar.gz Project-Tick-ab346593cab00bc000cb34819f3784580d21e6d7.zip | |
Add zlib dependency
Todo: make it optional
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | test/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 9a2eb71cb8..cd073e0e56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -19,7 +19,8 @@ add_library(nbt++ STATIC src/text/json_formatter.cpp) -find_package(CxxTest) +find_package(zlib REQUIRED) +find_package(CxxTest) option(NBT_BUILD_TESTS "Build the unit tests. Requires CxxTest." ${CXXTEST_FOUND}) diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 2c6c09ef61..c640ef054e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -18,7 +18,7 @@ CXXTEST_ADD_TEST(write_test write_test.cpp ${CMAKE_CURRENT_SOURCE_DIR}/write_tes target_link_libraries(write_test nbt++) CXXTEST_ADD_TEST(zlibstream_test zlibstream_test.cpp ${CMAKE_CURRENT_SOURCE_DIR}/zlibstream_test.h) -target_link_libraries(zlibstream_test nbt++) +target_link_libraries(zlibstream_test nbt++ z) add_executable(format_test format_test.cpp) target_link_libraries(format_test nbt++) |