Skip to content

Commit

Permalink
Merge pull request #12 from chuckatkins/disable-testing-until-fixed
Browse files Browse the repository at this point in the history
Disable testing until third party gtest libs are fixed
  • Loading branch information
Chuck Atkins authored Mar 30, 2017
2 parents 86024b9 + a589cdc commit ebc3ac2
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,14 +46,16 @@ include(CMakeDependentOption)

# Setup shared library / -fPIC stuff
get_property(SHARED_LIBS_SUPPORTED GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS)
cmake_dependent_option(BUILD_SHARED_LIBS
cmake_dependent_option(ADIOS_BUILD_SHARED_LIBS
"Whether or not to build shared libraries" ON
"SHARED_LIBS_SUPPORTED" OFF)
if(SHARED_LIBS_SUPPORTED)
cmake_dependent_option(ADIOS_ENABLE_PIC
"Build with Position Independent Code" ON
"NOT BUILD_SHARED_LIBS" ON)
"NOT ADIOS_BUILD_SHARED_LIBS" ON)
endif()
set(BUILD_SHARED_LIBS ${ADIOS_BUILD_SHARED_LIBS})

if(ADIOS_ENABLE_PIC)
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
endif()
Expand Down Expand Up @@ -92,6 +94,8 @@ endif()
#------------------------------------------------------------------------------#
# Testing
#------------------------------------------------------------------------------#
option(ADIOS_BUILD_TESTING "Build ADIOS tests" OFF)
set(BUILD_TESTING ${ADIOS_BUILD_TESTING})
# We have to wait until after the library is defined to enable testing
if(BUILD_TESTING)
enable_testing()
Expand All @@ -113,6 +117,7 @@ if(BUILD_SHARED_LIBS)
else()
message(" Type: static")
endif()
message(" Testing: ${BUILD_TESTING}")
message(" MPI: ${ADIOS_USE_MPI}")
message(" BZip2: ${ADIOS_USE_BZip2}")
message(" ADIOS1: ${ADIOS_USE_ADIOS1}")
Expand Down

0 comments on commit ebc3ac2

Please sign in to comment.