From 05c0b5d5ceb6ecef5db3ec28014d78085742c7a5 Mon Sep 17 00:00:00 2001 From: Yaser Afshar Date: Sat, 18 Jul 2020 15:12:31 -0500 Subject: [PATCH] Update the deprecated property and fix the empty value on macOS The `IMPORTED_LINK_INTERFACE_LIBRARIES` is deprecated and is updated to `INTERFACE_LINK_LIBRARIES` instead. On macOS `CMAKE_THREAD_LIBS_INIT` is empty since empty the thread functions are provided by the system libraries. To avoid getting `set_target_properties called with incorrect number of arguments` error message, we put it inside double quotes. --- cmake/Modules/GTest.cmake | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/Modules/GTest.cmake b/cmake/Modules/GTest.cmake index 36aafee10c..f8a8bf6e47 100644 --- a/cmake/Modules/GTest.cmake +++ b/cmake/Modules/GTest.cmake @@ -52,26 +52,26 @@ add_library(GTest::GTest UNKNOWN IMPORTED) set_target_properties(GTest::GTest PROPERTIES IMPORTED_LOCATION ${GTEST_LIBRARY_PATH} INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIR} - IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}") add_dependencies(GTest::GTest googletest) add_library(GTest::GMock UNKNOWN IMPORTED) set_target_properties(GTest::GMock PROPERTIES IMPORTED_LOCATION ${GMOCK_LIBRARY_PATH} INTERFACE_INCLUDE_DIRECTORIES ${GMOCK_INCLUDE_DIR} - IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}") add_dependencies(GTest::GMock googletest) add_library(GTest::GTestMain UNKNOWN IMPORTED) set_target_properties(GTest::GTestMain PROPERTIES IMPORTED_LOCATION ${GTEST_MAIN_LIBRARY_PATH} INTERFACE_INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIR} - IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}") add_dependencies(GTest::GTestMain googletest) add_library(GTest::GMockMain UNKNOWN IMPORTED) set_target_properties(GTest::GMockMain PROPERTIES IMPORTED_LOCATION ${GMOCK_MAIN_LIBRARY_PATH} INTERFACE_INCLUDE_DIRECTORIES ${GMOCK_INCLUDE_DIR} - IMPORTED_LINK_INTERFACE_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) + INTERFACE_LINK_LIBRARIES "${CMAKE_THREAD_LIBS_INIT}") add_dependencies(GTest::GMockMain googletest)