diff options
| author | Szczepan Zalega <szczepan@nitrokey.com> | 2017-09-20 12:55:16 +0200 |
|---|---|---|
| committer | Szczepan Zalega <szczepan@nitrokey.com> | 2017-09-20 12:55:16 +0200 |
| commit | eb447c7ff965abe92bf49dbf404447b1808322c0 (patch) | |
| tree | 9309e6614f23cc5cda6042e685b24eaa0a6b5522 /CMakeLists.txt | |
| parent | 7a04ee7dd3fad10e30581d22956234aeff2b2f3a (diff) | |
| parent | a57ed65f90c2ffda245c93aaa4aa710b605550d7 (diff) | |
| download | libnitrokey-eb447c7ff965abe92bf49dbf404447b1808322c0.tar.gz libnitrokey-eb447c7ff965abe92bf49dbf404447b1808322c0.tar.bz2 | |
Merge branch 'windows_MSVC2017' into OSX_merge_cleaned
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6741b18..11882f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,3 +1,8 @@ +# https://cmake.org/pipermail/cmake/2011-May/044166.html + IF(NOT DEFINED CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS) + SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON) + ENDIF() + cmake_minimum_required(VERSION 3.1) IF (UNIX) OPTION(USE_CLANG "Use CLang" FALSE) @@ -111,7 +116,7 @@ install (FILES ${LIB_INCLUDES} DESTINATION "include") IF (COMPILE_TESTS) include_directories(unittest/Catch/include) - add_library(catch SHARED unittest/catch_main.cpp ) + add_library(catch STATIC unittest/catch_main.cpp ) add_executable (test_C_API unittest/test_C_API.cpp) target_link_libraries (test_C_API ${EXTRA_LIBS} ${LIBNAME}-log catch) |