Merge branch 'master' of github.com:badgerman/iniparser

Conflicts:
	CMakeLists.txt
This commit is contained in:
Enno Rehling 2012-06-03 22:29:30 -07:00
parent 28ac6ae81c
commit c5aa169c47

View File

@ -2,17 +2,16 @@ project (cutest C)
add_library (${PROJECT_NAME} CuTest.c) add_library (${PROJECT_NAME} CuTest.c)
add_executable (AllTests AllTests.c CuTestTest.c) add_executable (CuTestTest AllTests.c CuTestTest.c)
target_link_libraries (AllTests cutest) target_link_libraries (CuTestTest cutest)
enable_testing() enable_testing()
add_test (cutest AllTests) add_test (cutest CuTestTest)
find_package (MSVC QUIET) IF (MSVC)
if (${MSVC_FOUND}) find_package (MSVC MODULE)
MSVC_CRT_SECURE_NO_WARNINGS (cutest) MSVC_CRT_SECURE_NO_WARNINGS (cutest CuTestTest)
MSVC_CRT_SECURE_NO_WARNINGS (AllTests) ENDIF (MSVC)
endif (${MSVC_FOUND})
set (CUTEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "CuTest headers") set (CUTEST_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "CuTest headers")
set (CUTEST_LIBRARIES cutest CACHE INTERNAL "CuTest libraries") set (CUTEST_LIBRARIES cutest CACHE INTERNAL "CuTest libraries")