From ba975dd4615c83ca1b77e240b1fe0e41ba87c809 Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Thu, 17 Aug 2017 09:14:21 -0400
Subject: [PATCH] CMake: Fix BUILD_SHARED_LIBS inconsistency with gtest
---
CMakeLists.txt | 12 ++----------
thirdparty/GTest/CMakeLists.txt | 1 +
2 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a1a89ed08..916cf0dc2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,18 +59,10 @@ include(CMakeDependentOption)
# to that. Otherwise base the default on whether or not shared libs are even
# supported.
get_property(SHARED_LIBS_SUPPORTED GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
-if(DEFINED ADIOS2_BUILD_SHARED_LIBS)
- set(ADIOS2_BUILD_SHARED_LIBS_DEFAULT ${ADIOS2_BUILD_SHARED_LIBS})
-elseif(DEFINED BUILD_SHARED_LIBS)
- set(ADIOS2_BUILD_SHARED_LIBS_DEFAULT ${BUILD_SHARED_LIBS})
-else()
- set(ADIOS2_BUILD_SHARED_LIBS_DEFAULT ${SHARED_LIBS_SUPPORTED})
-endif()
-cmake_dependent_option(ADIOS2_BUILD_SHARED_LIBS
- "Build shared libraries (so/dylib/dll)." ${ADIOS2_BUILD_SHARED_LIBS_DEFAULT}
+cmake_dependent_option(BUILD_SHARED_LIBS
+ "Build shared libraries (so/dylib/dll)." ${SHARED_LIBS_SUPPORTED}
"SHARED_LIBS_SUPPORTED" OFF
)
-set(BUILD_SHARED_LIBS ${ADIOS2_BUILD_SHARED_LIBS})
mark_as_advanced(BUILD_SHARED_LIBS)
# Setup PIC defaults. If explicitly specified somehow, then default
diff --git a/thirdparty/GTest/CMakeLists.txt b/thirdparty/GTest/CMakeLists.txt
index bdac080ca..f94b6fc44 100644
--- a/thirdparty/GTest/CMakeLists.txt
+++ b/thirdparty/GTest/CMakeLists.txt
@@ -2,4 +2,5 @@ set(BUILD_GTEST ON)
set(BUILD_GMOCK OFF)
set(gtest_disable_pthreads ON)
+set(CMAKE_POLICY_DEFAULT_CMP0042 NEW)
add_subdirectory(googletest EXCLUDE_FROM_ALL)
--
GitLab