From c5aa169c47d67d264edf407a035c2bc280ed8324 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Sun, 3 Jun 2012 22:29:30 -0700 Subject: [PATCH] Merge branch 'master' of github.com:badgerman/iniparser Conflicts: CMakeLists.txt --- CMakeLists.txt | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aff24b7..6e9bdc1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,17 +2,16 @@ project (cutest C) add_library (${PROJECT_NAME} CuTest.c) -add_executable (AllTests AllTests.c CuTestTest.c) -target_link_libraries (AllTests cutest) +add_executable (CuTestTest AllTests.c CuTestTest.c) +target_link_libraries (CuTestTest cutest) enable_testing() -add_test (cutest AllTests) +add_test (cutest CuTestTest) -find_package (MSVC QUIET) -if (${MSVC_FOUND}) - MSVC_CRT_SECURE_NO_WARNINGS (cutest) - MSVC_CRT_SECURE_NO_WARNINGS (AllTests) -endif (${MSVC_FOUND}) +IF (MSVC) + find_package (MSVC MODULE) + MSVC_CRT_SECURE_NO_WARNINGS (cutest CuTestTest) +ENDIF (MSVC) set (CUTEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "CuTest headers") set (CUTEST_LIBRARIES cutest CACHE INTERNAL "CuTest libraries")