Skip to content

Commit e759173

Browse files
committed
Adding googletest into cmake config summary
1 parent f1875f0 commit e759173

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

CMakeLists.txt

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,18 @@ if (SYSTEM_MACOSX)
4141
find_package(Qt5MacExtras REQUIRED)
4242
endif()
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
4549
add_subdirectory(src/third-party/libssh2)
4650
add_subdirectory(src/robomongo/ssh)
4751
add_subdirectory(src/third-party/qjson)
4852
add_subdirectory(src/third-party/qscintilla)
49-
add_subdirectory(src/third-party/googletest-1.8.1)
53+
add_subdirectory(${GOOGLE_TEST_DIR})
5054
add_subdirectory(src/robomongo)
5155
add_subdirectory(src/robomongo-unit-tests)
5256

5357
# Show configuration summary
54-
include(RobomongoConfigurationSummary)
55-
58+
include(RobomongoConfigurationSummary)

cmake/RobomongoConfigurationSummary.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ message("| Qt5 Network: ${Qt5Network_VERSION} ${Qt5Network_DIR}")
1212
message("| Qt5 Xml: ${Qt5Xml_VERSION} ${Qt5Xml_DIR}")
1313
message("| MongoDB: ${MongoDB_VERSION} ${MongoDB_BUILD_DIR}")
1414
message("| OpenSSL: ${OPENSSL_VERSION} ${OpenSSL_DIR}")
15+
message("| Googe Test: ${GOOGLE_TEST_VERSION} ${CMAKE_SOURCE_DIR}/${GOOGLE_TEST_DIR}")
1516
message("|")
1617
message("|-- Summary:")
1718
message("|")

0 commit comments

Comments
 (0)