From 590e2ed753ea181e7ff6e2e1c89a9783db4ef31b Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Tue, 8 Aug 2017 11:23:30 +0200 Subject: [PATCH] #1748 libecl : Add INSTALL_ERT to control install targets --- ThirdParty/Ert/CMakeLists.txt | 5 +++- ThirdParty/Ert/lib/CMakeLists.txt | 46 ++++++++++++++++--------------- 2 files changed, 28 insertions(+), 23 deletions(-) diff --git a/ThirdParty/Ert/CMakeLists.txt b/ThirdParty/Ert/CMakeLists.txt index 500b0adecf..24958a4bb3 100644 --- a/ThirdParty/Ert/CMakeLists.txt +++ b/ThirdParty/Ert/CMakeLists.txt @@ -331,6 +331,9 @@ if (BUILD_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 d5f95a7ff4..09a179f846 100644 --- a/ThirdParty/Ert/lib/CMakeLists.txt +++ b/ThirdParty/Ert/lib/CMakeLists.txt @@ -211,30 +211,32 @@ set_target_properties(ecl PROPERTIES VERSION ${ERT_VERSION_MAJOR}.${ERT_VERSION_MINOR} SOVERSION ${ERT_VERSION_MAJOR}) -install(TARGETS ecl - EXPORT ecl-config - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) -install(DIRECTORY include/ - DESTINATION include - PATTERN *.h -) -install(DIRECTORY include/ - DESTINATION include - PATTERN *.hpp EXCLUDE -) -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ - DESTINATION include - PATTERN *.h -) - -if (ERT_BUILD_CXX) +if (INSTALL_ERT) + install(TARGETS ecl + EXPORT ecl-config + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) install(DIRECTORY include/ DESTINATION include - PATTERN *.hpp -) -endif () + PATTERN *.h + ) + install(DIRECTORY include/ + DESTINATION include + PATTERN *.hpp EXCLUDE + ) + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/include/ + DESTINATION include + PATTERN *.h + ) + + if (ERT_BUILD_CXX) + install(DIRECTORY include/ + DESTINATION include + PATTERN *.hpp + ) + endif () +endif() if (NOT BUILD_TESTS) return ()