OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2659 from akva2/move_timestamp

Browse Source 
changed: move moduleVersion to a separate object library
This commit is contained in:
Atgeirr Flø Rasmussen 2020-06-08 12:51:56 +02:00 committed by GitHub
commit 1afbe4b0a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
CMakeLists.txt
View File

@ -201,13 +201,15 @@ else()
set(FLOW_DEFAULT_ENABLE_IF "TRUE") set(FLOW_DEFAULT_ENABLE_IF "TRUE")
endif() endif()
add_library(moduleVersion OBJECT opm/simulators/utils/moduleVersion.cpp)
# the production oriented general-purpose ECL simulator # the production oriented general-purpose ECL simulator
opm_add_test(flow opm_add_test(flow
ONLY_COMPILE ONLY_COMPILE
ALWAYS_ENABLE ALWAYS_ENABLE
DEFAULT_ENABLE_IF ${FLOW_DEFAULT_ENABLE_IF} DEFAULT_ENABLE_IF ${FLOW_DEFAULT_ENABLE_IF}
DEPENDS "opmsimulators" DEPENDS opmsimulators
LIBRARIES "opmsimulators" LIBRARIES opmsimulators
SOURCES SOURCES
flow/flow.cpp flow/flow.cpp
flow/flow_ebos_blackoil.cpp flow/flow_ebos_blackoil.cpp
@ -219,7 +221,9 @@ opm_add_test(flow
flow/flow_ebos_solvent.cpp flow/flow_ebos_solvent.cpp
flow/flow_ebos_energy.cpp flow/flow_ebos_energy.cpp
flow/flow_ebos_oilwater_polymer.cpp flow/flow_ebos_oilwater_polymer.cpp
flow/flow_ebos_oilwater_polymer_injectivity.cpp) flow/flow_ebos_oilwater_polymer_injectivity.cpp
$<TARGET_OBJECTS:moduleVersion>)
if (NOT BUILD_FLOW_BLACKOIL_ONLY) if (NOT BUILD_FLOW_BLACKOIL_ONLY)
set(FLOW_BLACKOIL_ONLY_DEFAULT_ENABLE_IF "FALSE") set(FLOW_BLACKOIL_ONLY_DEFAULT_ENABLE_IF "FALSE")
@ -232,11 +236,12 @@ opm_add_test(flow_blackoil
ONLY_COMPILE ONLY_COMPILE
ALWAYS_ENABLE ALWAYS_ENABLE
DEFAULT_ENABLE_IF ${FLOW_BLACKOIL_ONLY_DEFAULT_ENABLE_IF} DEFAULT_ENABLE_IF ${FLOW_BLACKOIL_ONLY_DEFAULT_ENABLE_IF}
DEPENDS "opmsimulators" DEPENDS opmsimulators
LIBRARIES "opmsimulators" LIBRARIES opmsimulators
SOURCES SOURCES
flow/flow.cpp flow/flow.cpp
flow/flow_ebos_blackoil.cpp) flow/flow_ebos_blackoil.cpp
$<TARGET_OBJECTS:moduleVersion>)
target_compile_definitions(flow_blackoil PRIVATE "FLOW_BLACKOIL_ONLY") target_compile_definitions(flow_blackoil PRIVATE "FLOW_BLACKOIL_ONLY")
if (NOT BUILD_FLOW_VARIANTS) if (NOT BUILD_FLOW_VARIANTS)
@ -249,26 +254,32 @@ endif()
opm_add_test(flow_blackoil_dunecpr opm_add_test(flow_blackoil_dunecpr
ONLY_COMPILE ONLY_COMPILE
DEFAULT_ENABLE_IF ${FLOW_VARIANTS_DEFAULT_ENABLE_IF} DEFAULT_ENABLE_IF ${FLOW_VARIANTS_DEFAULT_ENABLE_IF}
SOURCES flow/flow_blackoil_dunecpr.cpp SOURCES
flow/flow_blackoil_dunecpr.cpp
$<TARGET_OBJECTS:moduleVersion>
EXE_NAME flow_blackoil_dunecpr EXE_NAME flow_blackoil_dunecpr
DEPENDS "opmsimulators" DEPENDS opmsimulators
LIBRARIES "opmsimulators") LIBRARIES opmsimulators)
opm_add_test(flow_onephase opm_add_test(flow_onephase
ONLY_COMPILE ONLY_COMPILE
DEFAULT_ENABLE_IF ${FLOW_VARIANTS_DEFAULT_ENABLE_IF} DEFAULT_ENABLE_IF ${FLOW_VARIANTS_DEFAULT_ENABLE_IF}
SOURCES flow/flow_onephase.cpp SOURCES
flow/flow_onephase.cpp
$<TARGET_OBJECTS:moduleVersion>
EXE_NAME flow_onephase EXE_NAME flow_onephase
DEPENDS "opmsimulators" DEPENDS opmsimulators
LIBRARIES "opmsimulators") LIBRARIES opmsimulators)
opm_add_test(flow_onephase_energy opm_add_test(flow_onephase_energy
ONLY_COMPILE ONLY_COMPILE
DEFAULT_ENABLE_IF ${FLOW_VARIANTS_DEFAULT_ENABLE_IF} DEFAULT_ENABLE_IF ${FLOW_VARIANTS_DEFAULT_ENABLE_IF}
SOURCES flow/flow_onephase_energy.cpp SOURCES
flow/flow_onephase_energy.cpp
$<TARGET_OBJECTS:moduleVersion>
EXE_NAME flow_onephase_energy EXE_NAME flow_onephase_energy
DEPENDS "opmsimulators" DEPENDS opmsimulators
LIBRARIES "opmsimulators") LIBRARIES opmsimulators)
if (BUILD_FLOW) if (BUILD_FLOW)
install(TARGETS flow DESTINATION bin) install(TARGETS flow DESTINATION bin)

1
CMakeLists_files.cmake
View File

@ -34,7 +34,6 @@ list (APPEND MAIN_SOURCE_FILES
opm/simulators/timestepping/gatherConvergenceReport.cpp opm/simulators/timestepping/gatherConvergenceReport.cpp
opm/simulators/utils/DeferredLogger.cpp opm/simulators/utils/DeferredLogger.cpp
opm/simulators/utils/gatherDeferredLogger.cpp opm/simulators/utils/gatherDeferredLogger.cpp
opm/simulators/utils/moduleVersion.cpp
opm/simulators/utils/ParallelRestart.cpp opm/simulators/utils/ParallelRestart.cpp
opm/simulators/wells/VFPProdProperties.cpp opm/simulators/wells/VFPProdProperties.cpp
opm/simulators/wells/VFPInjProperties.cpp opm/simulators/wells/VFPInjProperties.cpp

1
opm/simulators/utils/moduleVersion.cpp
View File

@ -18,6 +18,7 @@
*/ */
#include <opm/simulators/utils/moduleVersion.hpp> #include <opm/simulators/utils/moduleVersion.hpp>
#include "project-timestamp.h"
#include "project-version.h" #include "project-version.h"
namespace Opm namespace Opm