From 3eac8d5694cfd1049f613cc5c638097976244768 Mon Sep 17 00:00:00 2001 From: Mike Taves Date: Thu, 20 Feb 2020 12:37:37 +1300 Subject: Switch build configuration logic from DISABLE_TIFF to ENABLE_TIFF * Autotools interface should be the same, but different ./configure --help * For CMake, the option should be -DENABLE_TIFF=NO (default is YES) * Use TIFF_ENABLED and CURL_ENABLED variables, based on option and outcome * Reword some messages and add hints * Move -DTIFF_ENABLED and -DCURL_ENABLED from global add_definitions() to target_compile_definitions(), which is recommended practice * Minor spelling and style consistency around SQLITE_VERSION check --- test/unit/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/unit/CMakeLists.txt b/test/unit/CMakeLists.txt index 845d07e5..cd662865 100644 --- a/test/unit/CMakeLists.txt +++ b/test/unit/CMakeLists.txt @@ -153,8 +153,9 @@ set_property(TEST gie_self_tests add_executable(test_network main.cpp test_network.cpp) -if(CURL_FOUND) +if(CURL_ENABLED) include_directories(${CURL_INCLUDE_DIR}) + target_compile_definitions(test_network PRIVATE -DCURL_ENABLED) target_link_libraries(test_network ${CURL_LIBRARY}) endif() target_link_libraries(test_network -- cgit v1.2.3