diff options
author | Andreas Schuh <andreas.schuh.84@gmail.com> | 2016-03-01 21:34:32 +0000 |
---|---|---|
committer | Andreas Schuh <andreas.schuh.84@gmail.com> | 2016-03-01 21:34:32 +0000 |
commit | 389ef3f737498f917cae1f743e41c8e4c7165085 (patch) | |
tree | 332d7fcfb15ab2d7c4bce2dd8b61720d0a6ba199 /test | |
parent | 752c63249bf3f1969cb3ae140ededa359441a57a (diff) | |
parent | f9e69b35312b4352206f86cfe6764972945889df (diff) | |
download | gflags-389ef3f737498f917cae1f743e41c8e4c7165085.tar.gz gflags-389ef3f737498f917cae1f743e41c8e4c7165085.tar.bz2 gflags-389ef3f737498f917cae1f743e41c8e4c7165085.zip |
Merge branch 'master' of github.com:gflags/gflags
Diffstat (limited to 'test')
-rw-r--r-- | test/CMakeLists.txt | 4 | ||||
-rw-r--r-- | test/nc/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 77b582f..2119943 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -22,9 +22,9 @@ else () set (type static) endif () if (BUILD_gflags_LIB) - link_libraries (gflags-${type}) + link_libraries (gflags_${type}) else () - link_libraries (gflags_nothreads-${type}) + link_libraries (gflags_nothreads_${type}) endif () # ---------------------------------------------------------------------------- diff --git a/test/nc/CMakeLists.txt b/test/nc/CMakeLists.txt index e425d91..d00b07d 100644 --- a/test/nc/CMakeLists.txt +++ b/test/nc/CMakeLists.txt @@ -1,6 +1,6 @@ ## gflags negative compilation tests -cmake_minimum_required (VERSION 2.8) +cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR) if (NOT TEST_NAME) message (FATAL_ERROR "Missing TEST_NAME CMake flag") @@ -13,4 +13,4 @@ find_package (gflags REQUIRED) include_directories ("${CMAKE_CURRENT_SOURCE_DIR}/..") add_definitions (-DTEST_${TEST_NAME_UPPER}) add_executable (gflags_${TEST_NAME} gflags_nc.cc) -target_link_libraries(gflags_${TEST_NAME} ${gflags_LIBRARIES}) +target_link_libraries(gflags_${TEST_NAME} gflags) |