From 47944f1e4cc3b97d0cd5964ee9cb730f35397431 Mon Sep 17 00:00:00 2001 From: wfg <wfg@pc0098504.ornl.gov> Date: Thu, 6 Apr 2017 17:15:30 -0400 Subject: [PATCH] Updated CMakeLists.txt files --- CMakeLists.txt | 8 ++++---- source/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0396a1c46..240c0554f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,17 +52,17 @@ include(CMakeDependentOption) # Setup shared library / -fPIC stuff get_property(SHARED_LIBS_SUPPORTED GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS) cmake_dependent_option(ADIOS_BUILD_SHARED_LIBS - "Whether or not to build shared libraries" ON + "Whether or not to build shared libraries" OFF "SHARED_LIBS_SUPPORTED" OFF) if(SHARED_LIBS_SUPPORTED) cmake_dependent_option(ADIOS_ENABLE_PIC - "Build with Position Independent Code" ON + "Build with Position Independent Code" OFF "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) + set(CMAKE_POSITION_INDEPENDENT_CODE OFF) endif() option(ADIOS_USE_MPI "Enable the MPI version of ADIOS" ON) @@ -70,7 +70,7 @@ if(ADIOS_USE_MPI) # Workaround for OpenMPI forcing the link of C++ bindings add_definitions(-DOMPI_SKIP_MPICXX) endif() -option(ADIOS_USE_BZip2 "Enable support for BZip2 transforms" ON) +option(ADIOS_USE_BZip2 "Enable support for BZip2 transforms" OFF) option(ADIOS_USE_ADIOS1 "Enable support for the ADIOS 1 engine" OFF) option(ADIOS_USE_DataMan "Enable support for the DataMan engine" OFF) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index 22d2afba5..611c256c9 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -4,7 +4,7 @@ #------------------------------------------------------------------------------# add_library(adios2 - ADIOS.cpp ADIOS.tcc ADIOS_inst.cpp + ADIOS.cpp ADIOS_inst.cpp #ADIOS_C.cpp capsule/heap/STLVector.cpp -- GitLab