Upgrade to CXX-17 gtest-1.14

Change-Id: I1c7316f151128cbc9318b226dac14950e399d2c7
Signed-off-by: Galantsev, Dmitrii <dmitrii.galantsev@amd.com>
This commit is contained in:
Galantsev, Dmitrii
2023-09-27 18:25:22 -05:00
parent f6ace9fa14
commit 8f9a6796f1
8 changed files with 20 additions and 24 deletions
+1 -1
View File
@@ -24,7 +24,7 @@ message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
## Compiler flags
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -std=c++11 ")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2")
# Use this instead of above for 32 bit
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -m32")
+9 -16
View File
@@ -49,20 +49,13 @@ set(SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR})
set(RDCTST "rdctst")
# Try to find googletest
find_package(GTest 1.11.0)
# GTest_FOUND is set to TRUE if ANY version is found
# GTest_VERSION is set if 1.11.0 or newer version is found
if(NOT GTest_FOUND STREQUAL "TRUE" OR NOT DEFINED GTest_VERSION)
# Google Test wasn't found. Download and compile ourselves
include(FetchContent)
FetchContent_Declare(
googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG release-1.11.0)
FetchContent_MakeAvailable(googletest)
endif()
# Download and compile googletest
include(FetchContent)
FetchContent_Declare(
googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG v1.14.0)
FetchContent_MakeAvailable(googletest)
# Source files
aux_source_directory(${SRC_DIR} rdctstSources)
@@ -83,15 +76,15 @@ target_include_directories(
PUBLIC ${SRC_DIR}/..)
target_link_libraries(${RDCTST}
PUBLIC GTest::gtest_main
PUBLIC rdc_bootstrap
PUBLIC rdc
PUBLIC rdc_ras
PUBLIC GTest::gtest_main
PUBLIC c
PUBLIC stdc++
PUBLIC pthread)
install(TARGETS ${RDCTST}
install(TARGETS ${RDCTST} gtest gtest_main
DESTINATION ${RDC_SHARE_INSTALL_PREFIX}/rdctst_tests
COMPONENT ${TESTS_COMPONENT})