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

#4266 : libecl : Update patch file related to install

Browse Source
This commit is contained in:
Magne Sjaastad 2019-05-09 09:24:54 +02:00
parent a31d8cbea6
commit bddbbebdcc
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
patches/install-ert.patch
View File

@ -1,7 +1,7 @@
From 57a5f7fc667d42a5405021c975dabc2db53079a4 Mon Sep 17 00:00:00 2001 From cff955fb7f4c0f87ce4164b58a5fd2359f1ee9d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacob=20St=C3=B8ren?= <jacob.storen@ceetronSolutions.com> From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Thu, 26 Oct 2017 17:16:42 +0200 Date: Thu, 9 May 2019 09:19:18 +0200
Subject: [PATCH] #2011 libecl: Add INSTALL_ERT to control install targets Subject: [PATCH] tmp
--- ---
ThirdParty/Ert/CMakeLists.txt | 5 ++++- ThirdParty/Ert/CMakeLists.txt | 5 ++++-
@ -9,10 +9,10 @@ Subject: [PATCH] #2011 libecl: Add INSTALL_ERT to control install targets
2 files changed, 6 insertions(+), 2 deletions(-) 2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ThirdParty/Ert/CMakeLists.txt b/ThirdParty/Ert/CMakeLists.txt diff --git a/ThirdParty/Ert/CMakeLists.txt b/ThirdParty/Ert/CMakeLists.txt
index ffb2de0f9..73fb3b30d 100644 index 36417d18e..c8050a1ca 100644
--- a/ThirdParty/Ert/CMakeLists.txt --- a/ThirdParty/Ert/CMakeLists.txt
+++ b/ThirdParty/Ert/CMakeLists.txt +++ b/ThirdParty/Ert/CMakeLists.txt
@@ -363,6 +363,9 @@ if (BUILD_PYTHON) @@ -346,6 +346,9 @@ if (ENABLE_PYTHON)
endif() endif()
endif() endif()
@ -24,10 +24,10 @@ index ffb2de0f9..73fb3b30d 100644
export(TARGETS ecl FILE eclConfig.cmake) export(TARGETS ecl FILE eclConfig.cmake)
export(PACKAGE ecl) export(PACKAGE ecl)
diff --git a/ThirdParty/Ert/lib/CMakeLists.txt b/ThirdParty/Ert/lib/CMakeLists.txt diff --git a/ThirdParty/Ert/lib/CMakeLists.txt b/ThirdParty/Ert/lib/CMakeLists.txt
index 477f95530..2b91ee17f 100644 index 079eb127d..ddf3e7821 100644
--- a/ThirdParty/Ert/lib/CMakeLists.txt --- a/ThirdParty/Ert/lib/CMakeLists.txt
+++ b/ThirdParty/Ert/lib/CMakeLists.txt +++ b/ThirdParty/Ert/lib/CMakeLists.txt
@@ -220,7 +220,7 @@ endif () @@ -200,7 +200,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})
@ -36,14 +36,14 @@ index 477f95530..2b91ee17f 100644
install(TARGETS ecl install(TARGETS ecl
EXPORT ecl-config EXPORT ecl-config
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -245,6 +245,7 @@ if (ERT_BUILD_CXX) @@ -212,6 +212,7 @@ install(DIRECTORY include/
PATTERN *.hpp install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/
DESTINATION include
) )
endif ()
+endif() +endif()
if (NOT BUILD_TESTS) if (NOT BUILD_TESTS)
return () return ()
-- --
2.16.2.windows.1 2.21.0.windows.1