mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
#3194 ecllib. Apply patch install-ert after update
This commit is contained in:
parent
6ebee07c84
commit
1ce7701fa3
5
ThirdParty/Ert/CMakeLists.txt
vendored
5
ThirdParty/Ert/CMakeLists.txt
vendored
@ -352,6 +352,9 @@ if (ENABLE_PYTHON)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
install(EXPORT ecl-config DESTINATION share/cmake/ecl)
|
if (INSTALL_ERT)
|
||||||
|
install(EXPORT ecl-config DESTINATION share/cmake/ecl)
|
||||||
|
endif()
|
||||||
|
|
||||||
export(TARGETS ecl FILE eclConfig.cmake)
|
export(TARGETS ecl FILE eclConfig.cmake)
|
||||||
export(PACKAGE ecl)
|
export(PACKAGE ecl)
|
||||||
|
3
ThirdParty/Ert/lib/CMakeLists.txt
vendored
3
ThirdParty/Ert/lib/CMakeLists.txt
vendored
@ -205,7 +205,7 @@ endif ()
|
|||||||
set_target_properties(ecl PROPERTIES
|
set_target_properties(ecl PROPERTIES
|
||||||
VERSION ${ECL_VERSION_MAJOR}.${ECL_VERSION_MINOR}
|
VERSION ${ECL_VERSION_MAJOR}.${ECL_VERSION_MINOR}
|
||||||
SOVERSION ${ECL_VERSION_MAJOR})
|
SOVERSION ${ECL_VERSION_MAJOR})
|
||||||
|
if (INSTALL_ERT)
|
||||||
install(TARGETS ecl
|
install(TARGETS ecl
|
||||||
EXPORT ecl-config
|
EXPORT ecl-config
|
||||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
@ -230,6 +230,7 @@ if (ERT_BUILD_CXX)
|
|||||||
PATTERN *.hpp
|
PATTERN *.hpp
|
||||||
)
|
)
|
||||||
endif ()
|
endif ()
|
||||||
|
endif()
|
||||||
|
|
||||||
if (NOT BUILD_TESTS)
|
if (NOT BUILD_TESTS)
|
||||||
return ()
|
return ()
|
||||||
|
Loading…
Reference in New Issue
Block a user