Skip to content

Commit 392ed8f

Browse files
committed
CMake: fix broken Googletest build on Oracle Linux 9
1 parent 384d264 commit 392ed8f

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

CMakeModules/unit_tests.cmake

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ include(ExternalProject)
99
ExternalProject_Add(
1010
googletest
1111
GIT_REPOSITORY https://github.com/google/googletest.git
12-
GIT_TAG "release-1.8.1"
12+
GIT_TAG "release-1.12.1"
1313
UPDATE_COMMAND ""
1414
INSTALL_COMMAND ""
1515
LOG_DOWNLOAD ON
@@ -22,36 +22,36 @@ set(GTEST_INCLUDE_DIRS ${source_dir}/googletest/include)
2222
set(GMOCK_INCLUDE_DIRS ${source_dir}/googlemock/include)
2323

2424
ExternalProject_Get_Property(googletest binary_dir)
25-
set(GTEST_LIBRARY_PATH ${binary_dir}/googlemock/gtest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest.a)
25+
set(GTEST_LIBRARY_PATH ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest.a)
2626
set(GTEST_LIBRARY gtest)
2727
add_library(${GTEST_LIBRARY} UNKNOWN IMPORTED)
2828
set_target_properties(${GTEST_LIBRARY} PROPERTIES
29-
IMPORTED_LOCATION ${GTEST_LIBRARY_PATH}
30-
IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
29+
"IMPORTED_LOCATION" "${GTEST_LIBRARY_PATH}"
30+
"IMPORTED_LINK_INTERFACE_LIBRARIES" "${CMAKE_THREAD_LIBS_INIT}")
3131
add_dependencies(${GTEST_LIBRARY} googletest)
3232

33-
set(GTEST_MAIN_LIBRARY_PATH ${binary_dir}/googlemock/gtest/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main.a)
33+
set(GTEST_MAIN_LIBRARY_PATH ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gtest_main.a)
3434
set(GTEST_MAIN_LIBRARY gtest_main)
3535
add_library(${GTEST_MAIN_LIBRARY} UNKNOWN IMPORTED)
3636
set_target_properties(${GTEST_MAIN_LIBRARY} PROPERTIES
37-
IMPORTED_LOCATION ${GTEST_MAIN_LIBRARY_PATH}
38-
IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
37+
"IMPORTED_LOCATION" "${GTEST_MAIN_LIBRARY_PATH}"
38+
"IMPORTED_LINK_INTERFACE_LIBRARIES" "${CMAKE_THREAD_LIBS_INIT}")
3939
add_dependencies(${GTEST_MAIN_LIBRARY} googletest)
4040

41-
set(GMOCK_LIBRARY_PATH ${binary_dir}/googlemock/${CMAKE_FIND_LIBRARY_PREFIXES}gmock.a)
41+
set(GMOCK_LIBRARY_PATH ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gmock.a)
4242
set(GMOCK_LIBRARY gmock)
4343
add_library(${GMOCK_LIBRARY} UNKNOWN IMPORTED)
4444
set_target_properties(${GMOCK_LIBRARY} PROPERTIES
45-
IMPORTED_LOCATION ${GMOCK_LIBRARY_PATH}
46-
IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
45+
"IMPORTED_LOCATION" "${GMOCK_LIBRARY_PATH}"
46+
"IMPORTED_LINK_INTERFACE_LIBRARIES" "${CMAKE_THREAD_LIBS_INIT}")
4747
add_dependencies(${GMOCK_LIBRARY} googletest)
4848

49-
set(GMOCK_MAIN_LIBRARY_PATH ${binary_dir}/googlemock/${CMAKE_FIND_LIBRARY_PREFIXES}gmock_main.a)
49+
set(GMOCK_MAIN_LIBRARY_PATH ${binary_dir}/lib/${CMAKE_FIND_LIBRARY_PREFIXES}gmock_main.a)
5050
set(GMOCK_MAIN_LIBRARY gmock_main)
5151
add_library(${GMOCK_MAIN_LIBRARY} UNKNOWN IMPORTED)
5252
set_target_properties(${GMOCK_MAIN_LIBRARY} PROPERTIES
53-
IMPORTED_LOCATION ${GMOCK_MAIN_LIBRARY_PATH}
54-
IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
53+
"IMPORTED_LOCATION" "${GMOCK_MAIN_LIBRARY_PATH}"
54+
"IMPORTED_LINK_INTERFACE_LIBRARIES" "${CMAKE_THREAD_LIBS_INIT}")
5555
add_dependencies(${GMOCK_MAIN_LIBRARY} ${GTEST_LIBRARY})
5656

5757
include_directories(

0 commit comments

Comments
 (0)