implement new option ENABLE_GOOGLETEST_INSTALL; implement GNUInstallD…

…irs for correct lib target name. Apply changes from google#1161 to support windows better (dll goes to runtime, .lib(export) to lib and .lib(static) to lib )
d3x0r · Jul 31, 2017 · 9246ecb · 9246ecb
1 parent 4bab34d
commit 9246ecb
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,6 +4,10 @@ project( googletest-distribution )
 
 enable_testing()
 
+include(GNUInstallDirs)
+
+option(DISBLE_GOOGLETEST_INSTALL "Skip installation" ON)
+
 option(BUILD_GTEST "Builds the googletest subproject" OFF)
 
 #Note that googlemock target already builds googletest

diff --git a/googlemock/CMakeLists.txt b/googlemock/CMakeLists.txt
@@ -103,10 +103,14 @@ endif()
 ########################################################################
 #
 # Install rules
-install(TARGETS gmock gmock_main
-  DESTINATION lib)
-install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock
-  DESTINATION include)
+if(NOT DISABLE_GOOGLETEST_INSTALL)
+  install(TARGETS gmock gmock_main
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
+  install(DIRECTORY ${gmock_SOURCE_DIR}/include/gmock
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+endif(NOT DISABLE_GOOGLETEST_INSTALL)
 
 ########################################################################
 #

diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
@@ -102,10 +102,14 @@ endif()
 ########################################################################
 #
 # Install rules
-install(TARGETS gtest gtest_main
-  DESTINATION lib)
-install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest
-  DESTINATION include)
+if(NOT DISABLE_GOOGLETEST_INSTALL)
+  install(TARGETS gtest gtest_main
+    RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+  install(DIRECTORY ${gtest_SOURCE_DIR}/include/gtest
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
+endif(NOT DISABLE_GOOGLETEST_INSTALL)
 
 ########################################################################
 #