File tree Expand file tree Collapse file tree 2 files changed +7
-3
lines changed
Expand file tree Collapse file tree 2 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -41,15 +41,18 @@ if (SYSTEM_MACOSX)
4141 find_package (Qt5MacExtras REQUIRED )
4242endif ()
4343
44+ # todo: Use equivalent vars from googletest cmake files. Currently they are somehow not working.
45+ set (GOOGLE_TEST_VERSION 1.8.1)
46+ set (GOOGLE_TEST_DIR src/third-party/googletest-${GOOGLE_TEST_VERSION} )
47+
4448# Projects
4549add_subdirectory (src/third-party/libssh2 )
4650add_subdirectory (src/robomongo/ssh )
4751add_subdirectory (src/third-party/qjson )
4852add_subdirectory (src/third-party/qscintilla )
49- add_subdirectory (src/third-party/googletest-1.8.1 )
53+ add_subdirectory (${GOOGLE_TEST_DIR} )
5054add_subdirectory (src/robomongo )
5155add_subdirectory (src/robomongo-unit-tests )
5256
5357# Show configuration summary
54- include (RobomongoConfigurationSummary )
55-
58+ include (RobomongoConfigurationSummary )
Original file line number Diff line number Diff line change @@ -12,6 +12,7 @@ message("| Qt5 Network: ${Qt5Network_VERSION} ${Qt5Network_DIR}")
1212message ("| Qt5 Xml: ${Qt5Xml_VERSION} ${Qt5Xml_DIR} " )
1313message ("| MongoDB: ${MongoDB_VERSION} ${MongoDB_BUILD_DIR} " )
1414message ("| OpenSSL: ${OPENSSL_VERSION} ${OpenSSL_DIR} " )
15+ message ("| Googe Test: ${GOOGLE_TEST_VERSION} ${CMAKE_SOURCE_DIR} /${GOOGLE_TEST_DIR} " )
1516message ("|" )
1617message ("|-- Summary:" )
1718message ("|" )
You can’t perform that action at this time.
0 commit comments