Revert clever setting of version number in dune.module
dunecontrol will read the dune.module file first, before calling any configuration files; thus it cannot be initialized from the script but the version numbers must be hardcoded here and updated manually.
This commit is contained in:
parent
d8c045cdfd
commit
39758ab13b
@ -269,7 +269,7 @@ install (
|
||||
DESTINATION ${_dbg_prefix}${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_LIBDIR}
|
||||
)
|
||||
install (
|
||||
FILES ${PROJECT_BINARY_DIR}/dune.module
|
||||
FILES ${PROJECT_SOURCE_DIR}/dune.module
|
||||
DESTINATION ${CMAKE_INSTALL_LIBDIR_NOARCH}/dunecontrol/opm-core
|
||||
)
|
||||
message (STATUS "This build defaults to installing in ${CMAKE_INSTALL_PREFIX}")
|
||||
|
@ -46,11 +46,6 @@ function (opm_cmake_config name)
|
||||
FILE CMAKE "${PROJECT_BINARY_DIR}/${name}-config.cmake"
|
||||
APPEND "${${name}_CONFIG_VARS}"
|
||||
)
|
||||
configure_file (
|
||||
${PROJECT_SOURCE_DIR}/dune.module.in
|
||||
${PROJECT_BINARY_DIR}/dune.module
|
||||
@ONLY
|
||||
)
|
||||
|
||||
# config-mode .pc file; use this to find the build tree
|
||||
configure_pc_file (
|
||||
|
@ -1,3 +1,3 @@
|
||||
Module: opm-core
|
||||
Version: @opm-core_VERSION_MAJOR@.@opm-core_VERSION_MINOR@
|
||||
Version: 1.0
|
||||
Depends: dune-common (>= 2.2) dune-istl (>= 2.2)
|
Loading…
Reference in New Issue
Block a user