From 5c95b5a6056c359fdd5bc37d7706995d2280e7e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Erik=20Jensen?= Date: Tue, 30 Oct 2018 13:30:44 +0100 Subject: [PATCH] #3576 Apply patch install-ert.patch after upgrading ecllib --- ThirdParty/Ert/CMakeLists.txt | 5 ++++- ThirdParty/Ert/lib/CMakeLists.txt | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ThirdParty/Ert/CMakeLists.txt b/ThirdParty/Ert/CMakeLists.txt index 332b1696e8..5e2e1e42b4 100644 --- a/ThirdParty/Ert/CMakeLists.txt +++ b/ThirdParty/Ert/CMakeLists.txt @@ -352,6 +352,9 @@ if (ENABLE_PYTHON) 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(PACKAGE ecl) diff --git a/ThirdParty/Ert/lib/CMakeLists.txt b/ThirdParty/Ert/lib/CMakeLists.txt index ed7b1602f1..a57e50e212 100644 --- a/ThirdParty/Ert/lib/CMakeLists.txt +++ b/ThirdParty/Ert/lib/CMakeLists.txt @@ -204,7 +204,7 @@ endif () set_target_properties(ecl PROPERTIES VERSION ${ECL_VERSION_MAJOR}.${ECL_VERSION_MINOR} SOVERSION ${ECL_VERSION_MAJOR}) - +if (INSTALL_ERT) install(TARGETS ecl EXPORT ecl-config ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} @@ -229,6 +229,7 @@ if (ERT_BUILD_CXX) PATTERN *.hpp ) endif () +endif() if (NOT BUILD_TESTS) return ()