Skip to content
Snippets Groups Projects
Commit ba975dd4 authored by Atkins, Charles Vernon's avatar Atkins, Charles Vernon
Browse files

CMake: Fix BUILD_SHARED_LIBS inconsistency with gtest

parent 65f28efe
No related branches found
No related tags found
1 merge request!236Fix misc mac issues
......@@ -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
......
......@@ -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)
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