diff options
| author | Christian Linke <Christian.Linke@bmw.de> | 2016-02-11 07:28:47 +0100 |
|---|---|---|
| committer | Christian Linke <Christian.Linke@bmw.de> | 2016-02-15 09:00:59 +0100 |
| commit | 5bcd206b9270d9a79e212f91723ea1a08a4d4859 (patch) | |
| tree | 55b0cd4d07fbd7ebfd15d58d02e9cae6ae61b127 /googleMock | |
| parent | 59080ecc2c8840fd85c561adea3f85f5344534a8 (diff) | |
| download | audiomanager-5bcd206b9270d9a79e212f91723ea1a08a4d4859.tar.gz | |
* rework of the build structure, adopt to standard cmake package structure7.4
* check versions when loading the libs
* introduction of the AudioManagerCore
* give control plugin as file or directory
* remove SQLITE
* either find and use gmock or build and install it
* fixed [Bug 411]
* compile flag gnu11 is now used
Signed-off-by: Christian Linke <Christian.Linke@bmw.de>
Signed-off-by: Christian Linke <Christian.Linke@bmw.de>
Diffstat (limited to 'googleMock')
| -rw-r--r-- | googleMock/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | googleMock/gtest/CMakeLists.txt | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/googleMock/CMakeLists.txt b/googleMock/CMakeLists.txt index 3b29c48..82e16c2 100644 --- a/googleMock/CMakeLists.txt +++ b/googleMock/CMakeLists.txt @@ -86,6 +86,13 @@ target_link_libraries(gmock gtest) cxx_library(gmock_main "${cxx_strict}" src/gmock_main.cc) target_link_libraries(gmock_main gmock) +INSTALL(TARGETS gmock gmock_main + ARCHIVE DESTINATION lib + COMPONENT dev) +INSTALL(DIRECTORY "${CMAKE_SOURCE_DIR}/googleMock/include/gmock" + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ + COMPONENT dev) + ######################################################################## # # Google Mock's own tests. diff --git a/googleMock/gtest/CMakeLists.txt b/googleMock/gtest/CMakeLists.txt index 0fe2654..133316c 100644 --- a/googleMock/gtest/CMakeLists.txt +++ b/googleMock/gtest/CMakeLists.txt @@ -71,6 +71,13 @@ cxx_library(gtest "${cxx_strict}" src/gtest-all.cc) cxx_library(gtest_main "${cxx_strict}" src/gtest_main.cc) target_link_libraries(gtest_main gtest) +INSTALL(TARGETS gtest gtest_main + ARCHIVE DESTINATION lib + COMPONENT dev) +INSTALL(DIRECTORY "${CMAKE_SOURCE_DIR}/googleMock/gtest/include/gtest" + DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ + COMPONENT dev) + ######################################################################## # # Samples on how to link user tests with gtest or gtest_main. |