diff options
| author | Juergen Gehring <juergen.gehring@bmw.de> | 2018-01-25 01:02:22 -0800 |
|---|---|---|
| committer | Juergen Gehring <juergen.gehring@bmw.de> | 2018-01-25 01:02:22 -0800 |
| commit | f072e9bf03d8497ccfaff622b801968b14b30727 (patch) | |
| tree | 4f6a8ebab2bdda52ab86de405bc811a7eac20ba7 /CMakeLists.txt | |
| parent | 3fac877074d0336dfb8e68f3312cde06dcdc453e (diff) | |
| download | genivi-common-api-dbus-runtime-f072e9bf03d8497ccfaff622b801968b14b30727.tar.gz | |
capicxx-dbus-runtime 3.1.12.23.1.12.2
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f0e1c59..e98d655 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -169,7 +169,7 @@ endif() set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DCOMMONAPI_LOGLEVEL=COMMONAPI_LOGLEVEL_${MAX_LOG_LEVEL}") -message(STATUS "Compiler options: ${CMAKE_CXX_FLAGS}") +message(STATUS "Compiler options: ${CMAKE_CXX_FLAGS}") include_directories( include @@ -325,7 +325,7 @@ else() COMMAND asciidoc -a version=${PACKAGE_VERSION} -b html - -o doc/html/README.html + -o doc/html/README.html ${PROJECT_BINARY_DIR}/../README) endif() endif() @@ -360,6 +360,10 @@ if ("${BUILD_SHARED_LIBS}" STREQUAL "ON") set(BUILD_SHARED_LIBS OFF) set(BUILD_SHARED_LIBS_AUTOMATIC_OFF 1) endif() +# ...but visual studio needs a shared CRT for gtest, otherwise the linker won't work correctly with the testcases. +if (MSVC) + set( gtest_force_shared_crt ON CACHE BOOL "Always use msvcrt.dll" ) +endif() add_subdirectory(${GTEST_ROOT} ${CMAKE_CURRENT_BINARY_DIR}/gtest EXCLUDE_FROM_ALL) if ("${BUILD_SHARED_LIBS_AUTOMATIC_OFF}" STREQUAL "1") set(BUILD_SHARED_LIBS ON) @@ -382,4 +386,3 @@ add_dependencies(check build_tests) # add test directory add_subdirectory( src/test EXCLUDE_FROM_ALL ) - |