From b7efe7679dcfc87e793d754cedfee0c1538795f0 Mon Sep 17 00:00:00 2001
From: aduffizi <alessandro.duffizi@lnf.infn.it>
Date: Mon, 2 Dec 2019 14:39:38 +0100
Subject: [PATCH] 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
---
CMakeLists.txt | 37 +++++++++++++++++++++++++++++++++----
1 file changed, 33 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a01847241..c3cf53066 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,21 +82,48 @@ endif()
IF (CHAOS_ONLY_DEPENDECY OR
CHAOS_ARCHITECTURE_TEST)
#google test
- MESG("Add google Test as external project")
- ExternalProject_Add(
+ MESG("Add google Test as external project")
+ IF(WIN32)
+ ExternalProject_Add(
googletest
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"
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}
+ -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} -DCMAKE_BUILD_TYPE=Release
LOG_DOWNLOAD ON
LOG_CONFIGURE 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
ExternalProject_Get_Property(googletest source_dir)
set(GTEST_INCLUDE_DIR ${source_dir}/include)
@@ -111,6 +138,8 @@ IF (CHAOS_ONLY_DEPENDECY OR
MESG("${GTEST_LIBRARY_DIR}")
MESG("${GTEST_LIBRARY_PATH}")
MESG("${GTEST_LIBRARY}")
+
+ ENDIF(WIN32)
ENDIF()
IF (USE_GPT)
--
GitLab