Loading isis/cmake/AddIsisModule.cmake +2 −2 Original line number Diff line number Diff line Loading @@ -222,10 +222,10 @@ function(add_isis_module name) # - Base module depends on 3rd party libs, other libs also depend on base. # - Only the base module gets both a static and shared library. if(${name} STREQUAL ${CORE_LIB_NAME}) set(reqLibs "${ALLLIBS};gtest;${CMAKE_THREAD_LIBS_INIT}") set(reqLibs "${ALLLIBS};gtest;gmock;${CMAKE_THREAD_LIBS_INIT}") set(alsoStatic ON) else() set(reqLibs "${CORE_LIB_NAME};${ALLLIBS};gtest;${CMAKE_THREAD_LIBS_INIT}") set(reqLibs "${CORE_LIB_NAME};${ALLLIBS};gtest;gmock;${CMAKE_THREAD_LIBS_INIT}") set(alsoStatic OFF) endif() Loading isis/cmake/gtest.cmake +20 −0 Original line number Diff line number Diff line Loading @@ -17,3 +17,23 @@ if (NOT TARGET gtest) add_library(gtest ${GOOGLETEST_SOURCES}) endif() if (NOT TARGET gmock) set(GOOGLEMOCK_ROOT ${CMAKE_SOURCE_DIR}/../gtest/googlemock CACHE STRING "Google Mock source root") include_directories(SYSTEM ${GOOGLEMOCK_ROOT} ${GOOGLEMOCK_ROOT}/include ) set(GOOGLEMOCK_SOURCES ${GOOGLEMOCK_ROOT}/src/gmock-all.cc ${GOOGLEMOCK_ROOT}/src/gmock_main.cc ) foreach(_source ${GOOGLEMOCK_SOURCES}) set_source_files_properties(${_source} PROPERTIES GENERATED 1) endforeach() add_library(gmock ${GOOGLEMOCK_SOURCES}) endif() Loading
isis/cmake/AddIsisModule.cmake +2 −2 Original line number Diff line number Diff line Loading @@ -222,10 +222,10 @@ function(add_isis_module name) # - Base module depends on 3rd party libs, other libs also depend on base. # - Only the base module gets both a static and shared library. if(${name} STREQUAL ${CORE_LIB_NAME}) set(reqLibs "${ALLLIBS};gtest;${CMAKE_THREAD_LIBS_INIT}") set(reqLibs "${ALLLIBS};gtest;gmock;${CMAKE_THREAD_LIBS_INIT}") set(alsoStatic ON) else() set(reqLibs "${CORE_LIB_NAME};${ALLLIBS};gtest;${CMAKE_THREAD_LIBS_INIT}") set(reqLibs "${CORE_LIB_NAME};${ALLLIBS};gtest;gmock;${CMAKE_THREAD_LIBS_INIT}") set(alsoStatic OFF) endif() Loading
isis/cmake/gtest.cmake +20 −0 Original line number Diff line number Diff line Loading @@ -17,3 +17,23 @@ if (NOT TARGET gtest) add_library(gtest ${GOOGLETEST_SOURCES}) endif() if (NOT TARGET gmock) set(GOOGLEMOCK_ROOT ${CMAKE_SOURCE_DIR}/../gtest/googlemock CACHE STRING "Google Mock source root") include_directories(SYSTEM ${GOOGLEMOCK_ROOT} ${GOOGLEMOCK_ROOT}/include ) set(GOOGLEMOCK_SOURCES ${GOOGLEMOCK_ROOT}/src/gmock-all.cc ${GOOGLEMOCK_ROOT}/src/gmock_main.cc ) foreach(_source ${GOOGLEMOCK_SOURCES}) set_source_files_properties(${_source} PROPERTIES GENERATED 1) endforeach() add_library(gmock ${GOOGLEMOCK_SOURCES}) endif()