Always use static libraries for opm libs and NRlib

This commit is contained in:
Magne Sjaastad 2016-06-05 18:45:53 +02:00
parent 94bf950278
commit 1c044da54a
4 changed files with 18 additions and 17 deletions

View File

@ -28,6 +28,7 @@ file ( GLOB NRLIB_WELL_SRC
) )
add_library( ${PROJECT_NAME} add_library( ${PROJECT_NAME}
STATIC
${NRLIB_IOTOOLS_SRC} ${NRLIB_IOTOOLS_SRC}
${NRLIB_WELL_SRC} ${NRLIB_WELL_SRC}
) )

View File

@ -3,25 +3,25 @@ cmake_minimum_required (VERSION 2.8)
project (custom-opm-common) project (custom-opm-common)
include_directories( include_directories(
${CMAKE_CURRENT_SOURCE_DIR}/opm-common ${CMAKE_CURRENT_SOURCE_DIR}/opm-common
) )
#include(opm-common/CMakeLists_files.cmake) #include(opm-common/CMakeLists_files.cmake)
list (APPEND MAIN_SOURCE_FILES list (APPEND MAIN_SOURCE_FILES
opm-common/opm/common/data/SimulationDataContainer.cpp opm-common/opm/common/data/SimulationDataContainer.cpp
opm-common/opm/common/OpmLog/CounterLog.cpp opm-common/opm/common/OpmLog/CounterLog.cpp
opm-common/opm/common/OpmLog/EclipsePRTLog.cpp opm-common/opm/common/OpmLog/EclipsePRTLog.cpp
opm-common/opm/common/OpmLog/LogBackend.cpp opm-common/opm/common/OpmLog/LogBackend.cpp
opm-common/opm/common/OpmLog/Logger.cpp opm-common/opm/common/OpmLog/Logger.cpp
opm-common/opm/common/OpmLog/LogUtil.cpp opm-common/opm/common/OpmLog/LogUtil.cpp
opm-common/opm/common/OpmLog/OpmLog.cpp opm-common/opm/common/OpmLog/OpmLog.cpp
opm-common/opm/common/OpmLog/StreamLog.cpp opm-common/opm/common/OpmLog/StreamLog.cpp
opm-common/opm/common/OpmLog/TimerLog.cpp opm-common/opm/common/OpmLog/TimerLog.cpp
) )
add_library( ${PROJECT_NAME} add_library( ${PROJECT_NAME}
${MAIN_SOURCE_FILES} STATIC
${MAIN_SOURCE_FILES}
) )

View File

@ -321,9 +321,8 @@ generated-source/ParserKeywords3.cpp
) )
add_library(${PROJECT_NAME} add_library(${PROJECT_NAME}
STATIC
${incl_path} ${incl_path}
${opm_parser_generated_source_files} ${opm_parser_generated_source_files}
) )

View File

@ -8,11 +8,12 @@ include_directories(
) )
list (APPEND MAIN_SOURCE_FILES list (APPEND MAIN_SOURCE_FILES
opm/json/JsonObject.cpp opm/json/JsonObject.cpp
opm/json/cjson/cJSON.c opm/json/cjson/cJSON.c
) )
add_library( ${PROJECT_NAME} add_library( ${PROJECT_NAME}
${MAIN_SOURCE_FILES} STATIC
${MAIN_SOURCE_FILES}
) )