Skip to content
Snippets Groups Projects
Commit b7efe767 authored by Alessandro D'Uffizi's avatar Alessandro D'Uffizi
Browse files

Created separate and only for WIN32, external project googleTest, with version...

Created separate and only for WIN32, external project googleTest, with version 1.10 instead of 1.8 . For other target, nothing change. I will commit because it will have NO EFFECT AT ALL for other targets
parent b40c93f1
No related branches found
No related tags found
No related merge requests found
...@@ -82,21 +82,48 @@ endif() ...@@ -82,21 +82,48 @@ endif()
IF (CHAOS_ONLY_DEPENDECY OR IF (CHAOS_ONLY_DEPENDECY OR
CHAOS_ARCHITECTURE_TEST) CHAOS_ARCHITECTURE_TEST)
#google test #google test
MESG("Add google Test as external project") MESG("Add google Test as external project")
ExternalProject_Add( IF(WIN32)
ExternalProject_Add(
googletest googletest
GIT_REPOSITORY https://github.com/google/googletest.git GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG release-1.8.0 GIT_TAG release-1.10.0
PREFIX "${CMAKE_BINARY_DIR}/ext_dep/googletest-prefix" PREFIX "${CMAKE_BINARY_DIR}/ext_dep/googletest-prefix"
SOURCE_DIR "${CMAKE_BINARY_DIR}/ext_dep/googletest-src" SOURCE_DIR "${CMAKE_BINARY_DIR}/ext_dep/googletest-src"
BINARY_DIR "${CMAKE_BINARY_DIR}/ext_dep/googletest-build" BINARY_DIR "${CMAKE_BINARY_DIR}/ext_dep/googletest-build"
CMAKE_ARGS CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE=Release
LOG_DOWNLOAD ON LOG_DOWNLOAD ON
LOG_CONFIGURE ON LOG_CONFIGURE ON
LOG_BUILD ON) LOG_BUILD ON)
# Specify include dir
ExternalProject_Get_Property(googletest source_dir)
set(GTEST_INCLUDE_DIR ${source_dir}/include)
# Library
ExternalProject_Get_Property(googletest binary_dir)
set(GTEST_LIBRARY_DIR ${binary_dir})
ExternalProject_Get_Property(googletest binary_dir)
set(GTEST_LIBRARY_PATH ${binary_dir}/${CMAKE_FIND_LIBRARY_PREFIXES}gtest.a)
MESG("${GTEST_INCLUDE_DIR}")
MESG("${GTEST_LIBRARY_DIR}")
MESG("${GTEST_LIBRARY_PATH}")
MESG("${GTEST_LIBRARY}")
ELSE(WIN32)
ExternalProject_Add(
googletest
GIT_REPOSITORY https://github.com/google/googletest.git
GIT_TAG release-1.8.0
PREFIX "${CMAKE_BINARY_DIR}/ext_dep/googletest-prefix"
SOURCE_DIR "${CMAKE_BINARY_DIR}/ext_dep/googletest-src"
BINARY_DIR "${CMAKE_BINARY_DIR}/ext_dep/googletest-build"
CMAKE_ARGS
-DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
LOG_DOWNLOAD ON
LOG_CONFIGURE ON
LOG_BUILD ON)
# Specify include dir # Specify include dir
ExternalProject_Get_Property(googletest source_dir) ExternalProject_Get_Property(googletest source_dir)
set(GTEST_INCLUDE_DIR ${source_dir}/include) set(GTEST_INCLUDE_DIR ${source_dir}/include)
...@@ -111,6 +138,8 @@ IF (CHAOS_ONLY_DEPENDECY OR ...@@ -111,6 +138,8 @@ IF (CHAOS_ONLY_DEPENDECY OR
MESG("${GTEST_LIBRARY_DIR}") MESG("${GTEST_LIBRARY_DIR}")
MESG("${GTEST_LIBRARY_PATH}") MESG("${GTEST_LIBRARY_PATH}")
MESG("${GTEST_LIBRARY}") MESG("${GTEST_LIBRARY}")
ENDIF(WIN32)
ENDIF() ENDIF()
IF (USE_GPT) IF (USE_GPT)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment