| Julian Hall | 3d844c2 | 2020-11-23 18:22:43 +0100 | [diff] [blame^] | 1 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
| 2 | index b1900bb..d9ca865 100644 |
| 3 | --- a/CMakeLists.txt |
| 4 | +++ b/CMakeLists.txt |
| 5 | @@ -116,8 +116,13 @@ if(PkgHelpers_AVAILABLE) |
| 6 | ${CMAKE_CURRENT_BINARY_DIR}/CppUTestConfig.cmake |
| 7 | INSTALL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR} |
| 8 | PATH_VARS INCLUDE_DIR CMAKE_CURRENT_BINARY_DIR) |
| 9 | - export(TARGETS CppUTest CppUTestExt |
| 10 | + if(TARGET CppUTestExt) |
| 11 | + export(TARGETS CppUTest |
| 12 | FILE "${CMAKE_CURRENT_BINARY_DIR}/CppUTestTargets.cmake") |
| 13 | + else() |
| 14 | + export(TARGETS CppUTest |
| 15 | + FILE "${CMAKE_CURRENT_BINARY_DIR}/CppUTestTargets.cmake") |
| 16 | + endif() |
| 17 | write_basic_package_version_file( |
| 18 | ${CMAKE_CURRENT_BINARY_DIR}/CppUTestConfigVersion.cmake |
| 19 | VERSION ${CppUTest_version_major}.${CppUTest_version_minor} |
| 20 | diff --git a/cmake/Modules/CppUTestConfigurationOptions.cmake b/cmake/Modules/CppUTestConfigurationOptions.cmake |
| 21 | index 634482c..a00b5eb 100644 |
| 22 | --- a/cmake/Modules/CppUTestConfigurationOptions.cmake |
| 23 | +++ b/cmake/Modules/CppUTestConfigurationOptions.cmake |
| 24 | @@ -1,19 +1,19 @@ |
| 25 | if (MSVC) |
| 26 | - set(CPP_PLATFORM VisualCpp) |
| 27 | + set(CPP_PLATFORM VisualCpp CACHE STRING "CppUTest platform.") |
| 28 | include_directories(${CppUTestRootDirectory}/include/Platforms/${CPP_PLATFORM}) |
| 29 | option(STDC_WANT_SECURE_LIB "Use MSVC safe functions" ON) |
| 30 | if(STDC_WANT_SECURE_LIB) |
| 31 | ADD_DEFINITIONS(-DSTDC_WANT_SECURE_LIB) |
| 32 | endif(STDC_WANT_SECURE_LIB) |
| 33 | elseif (STD_C) |
| 34 | - set(CPP_PLATFORM Gcc) |
| 35 | + set(CPP_PLATFORM Gcc CACHE STRING "CppUTest platform.") |
| 36 | else (MSVC) |
| 37 | set(STD_CPP False) |
| 38 | set(MEMORY_LEAK_DETECTION False) |
| 39 | set(CPPUTEST_CXX_FLAGS "${CPPUTEST_CXX_FLAGS} -nostdinc") |
| 40 | set(CPPUTEST_LD_FLAGS "${CPPUTEST_LD_FLAGS} -nostdinc") |
| 41 | set(CPPUTEST_STD_C_LIB_DISABLED 1) |
| 42 | - set(CPP_PLATFORM GccNoStdC) |
| 43 | + set(CPP_PLATFORM GccNoStdC CACHE STRING "CppUTest platform.") |
| 44 | endif (MSVC) |
| 45 | |
| 46 | include("${CppUTestRootDirectory}/cmake/Modules/CppUTestWarningFlags.cmake") |
| 47 | diff --git a/src/CppUTest/CMakeLists.txt b/src/CppUTest/CMakeLists.txt |
| 48 | index 736777f..d9a592f 100644 |
| 49 | --- a/src/CppUTest/CMakeLists.txt |
| 50 | +++ b/src/CppUTest/CMakeLists.txt |
| 51 | @@ -50,7 +50,7 @@ set(CppUTest_headers |
| 52 | |
| 53 | add_library(CppUTest STATIC ${CppUTest_src} ${CppUTest_headers}) |
| 54 | if (WIN32) |
| 55 | - target_link_libraries(CppUTest winmm.lib) |
| 56 | + target_link_libraries(CppUTest winmm) |
| 57 | endif (WIN32) |
| 58 | install(FILES ${CppUTest_headers} DESTINATION include/CppUTest) |
| 59 | install(TARGETS CppUTest |