From e09542e7c131bca9065941a23ae4e96f50d3f169 Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Wed, 7 Jun 2017 10:53:46 +0200 Subject: [PATCH 1/7] Fix CMake error (missing quotes, thx to Gerhard) --- cmake/SuperBuild.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/SuperBuild.cmake b/cmake/SuperBuild.cmake index 91ede9e7..efd8ad15 100644 --- a/cmake/SuperBuild.cmake +++ b/cmake/SuperBuild.cmake @@ -182,7 +182,7 @@ ExternalProject_Add (netgen ) -install(CODE "execute_process(COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/netgen)") +install(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" --build . --target install --config ${CMAKE_BUILD_TYPE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/netgen)") add_custom_target(test_netgen ${CMAKE_COMMAND} --build ${CMAKE_CURRENT_BINARY_DIR}/netgen From c2c16d6b033267f5050b9365b72e6726578b8fb9 Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Thu, 8 Jun 2017 14:48:13 +0200 Subject: [PATCH 2/7] CMake: fix missing components --- CMakeLists.txt | 2 +- ng/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 340a9fbd..d399fbf9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -440,7 +440,7 @@ get_directory_property(NETGEN_COMPILE_DEFINITIONS COMPILE_DEFINITIONS) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cmake/NetgenConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/NetgenConfig.cmake @ONLY ESCAPE_QUOTES) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/NetgenConfig.cmake DESTINATION ${NG_INSTALL_DIR_CMAKE}) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/NetgenConfig.cmake DESTINATION ${NG_INSTALL_DIR_CMAKE} COMPONENT netgen_devel) ####################################################################### # Configure message diff --git a/ng/CMakeLists.txt b/ng/CMakeLists.txt index 7c4a1f81..23991339 100644 --- a/ng/CMakeLists.txt +++ b/ng/CMakeLists.txt @@ -65,7 +65,7 @@ if(USE_PYTHON) set_target_properties( ngpy PROPERTIES OUTPUT_NAME "libngpy") endif() set_target_properties(ngpy PROPERTIES INSTALL_RPATH "${NG_RPATH_TOKEN}/../${NETGEN_PYTHON_RPATH}") - install(TARGETS ngpy DESTINATION ${NG_INSTALL_DIR_PYTHON}/${NG_INSTALL_SUFFIX}) + install(TARGETS ngpy DESTINATION ${NG_INSTALL_DIR_PYTHON}/${NG_INSTALL_SUFFIX} COMPONENT netgen) endif(USE_PYTHON) if(USE_GUI) From 22874f8bf50e80b7cd027c72b494a4b3675fa1bf Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Thu, 8 Jun 2017 15:15:20 +0200 Subject: [PATCH 3/7] CMake: fix install components --- CMakeLists.txt | 2 +- ng/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d399fbf9..4ca21f4c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,7 +163,7 @@ if(WIN32) endif(WIN32) set(NG_INSTALL_DIR EXPORT netgen-targets RUNTIME DESTINATION ${NG_INSTALL_DIR_BIN} COMPONENT netgen LIBRARY DESTINATION ${NG_INSTALL_DIR_LIB} COMPONENT netgen_devel ARCHIVE DESTINATION ${NG_INSTALL_DIR_LIB} COMPONENT netgen_devel) -install(EXPORT netgen-targets DESTINATION ${NG_INSTALL_DIR_CMAKE} ) +install(EXPORT netgen-targets DESTINATION ${NG_INSTALL_DIR_CMAKE} COMPONENT netgen-devel) set(CMAKE_MACOSX_RPATH TRUE) set(CMAKE_INSTALL_RPATH "${NG_RPATH_TOKEN};${NG_RPATH_TOKEN}/${NETGEN_RPATH}") diff --git a/ng/CMakeLists.txt b/ng/CMakeLists.txt index 23991339..6dd4d0b4 100644 --- a/ng/CMakeLists.txt +++ b/ng/CMakeLists.txt @@ -65,7 +65,7 @@ if(USE_PYTHON) set_target_properties( ngpy PROPERTIES OUTPUT_NAME "libngpy") endif() set_target_properties(ngpy PROPERTIES INSTALL_RPATH "${NG_RPATH_TOKEN}/../${NETGEN_PYTHON_RPATH}") - install(TARGETS ngpy DESTINATION ${NG_INSTALL_DIR_PYTHON}/${NG_INSTALL_SUFFIX} COMPONENT netgen) + install(TARGETS ngpy RUNTIME DESTINATION ${NG_INSTALL_DIR_PYTHON}/${NG_INSTALL_SUFFIX} ARCHIVE DESTINATION ${NG_INSTALL_DIR_LIB} COMPONENT netgen) endif(USE_PYTHON) if(USE_GUI) From 2e5b7082ea868d840e9668dc77e8bacb8ce86f8e Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Thu, 8 Jun 2017 15:21:32 +0200 Subject: [PATCH 4/7] CMake: again fix --- ng/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ng/CMakeLists.txt b/ng/CMakeLists.txt index 6dd4d0b4..6bcb62b4 100644 --- a/ng/CMakeLists.txt +++ b/ng/CMakeLists.txt @@ -65,7 +65,7 @@ if(USE_PYTHON) set_target_properties( ngpy PROPERTIES OUTPUT_NAME "libngpy") endif() set_target_properties(ngpy PROPERTIES INSTALL_RPATH "${NG_RPATH_TOKEN}/../${NETGEN_PYTHON_RPATH}") - install(TARGETS ngpy RUNTIME DESTINATION ${NG_INSTALL_DIR_PYTHON}/${NG_INSTALL_SUFFIX} ARCHIVE DESTINATION ${NG_INSTALL_DIR_LIB} COMPONENT netgen) + install(TARGETS ngpy RUNTIME DESTINATION ${NG_INSTALL_DIR_PYTHON}/${NG_INSTALL_SUFFIX} LIBRARY DESTINATION ${NG_INSTALL_DIR_LIB} ARCHIVE DESTINATION ${NG_INSTALL_DIR_LIB} COMPONENT netgen) endif(USE_PYTHON) if(USE_GUI) From 0fc20f3aeef2c4f74646da1ce6a707e824969438 Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Thu, 8 Jun 2017 15:26:35 +0200 Subject: [PATCH 5/7] CMake fix --- ng/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ng/CMakeLists.txt b/ng/CMakeLists.txt index 6bcb62b4..f413d4c2 100644 --- a/ng/CMakeLists.txt +++ b/ng/CMakeLists.txt @@ -65,7 +65,7 @@ if(USE_PYTHON) set_target_properties( ngpy PROPERTIES OUTPUT_NAME "libngpy") endif() set_target_properties(ngpy PROPERTIES INSTALL_RPATH "${NG_RPATH_TOKEN}/../${NETGEN_PYTHON_RPATH}") - install(TARGETS ngpy RUNTIME DESTINATION ${NG_INSTALL_DIR_PYTHON}/${NG_INSTALL_SUFFIX} LIBRARY DESTINATION ${NG_INSTALL_DIR_LIB} ARCHIVE DESTINATION ${NG_INSTALL_DIR_LIB} COMPONENT netgen) + install(TARGETS ngpy RUNTIME DESTINATION ${NG_INSTALL_DIR_PYTHON}/${NG_INSTALL_SUFFIX} LIBRARY DESTINATION ${NG_INSTALL_DIR_PYTHON}/${NG_INSTALL_SUFFIX} ARCHIVE DESTINATION ${NG_INSTALL_DIR_LIB} COMPONENT netgen) endif(USE_PYTHON) if(USE_GUI) From 86f8ed88e09acd0f934a078944d55a03358db60d Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Thu, 8 Jun 2017 16:05:12 +0200 Subject: [PATCH 6/7] CMake: hopefully the last fix --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4ca21f4c..1008999d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -163,7 +163,7 @@ if(WIN32) endif(WIN32) set(NG_INSTALL_DIR EXPORT netgen-targets RUNTIME DESTINATION ${NG_INSTALL_DIR_BIN} COMPONENT netgen LIBRARY DESTINATION ${NG_INSTALL_DIR_LIB} COMPONENT netgen_devel ARCHIVE DESTINATION ${NG_INSTALL_DIR_LIB} COMPONENT netgen_devel) -install(EXPORT netgen-targets DESTINATION ${NG_INSTALL_DIR_CMAKE} COMPONENT netgen-devel) +install(EXPORT netgen-targets DESTINATION ${NG_INSTALL_DIR_CMAKE} COMPONENT netgen_devel) set(CMAKE_MACOSX_RPATH TRUE) set(CMAKE_INSTALL_RPATH "${NG_RPATH_TOKEN};${NG_RPATH_TOKEN}/${NETGEN_RPATH}") From 24a67bcf88108bd0afed5e0bbba7b14d9b7605c0 Mon Sep 17 00:00:00 2001 From: Matthias Hochsteger Date: Thu, 8 Jun 2017 16:49:17 +0200 Subject: [PATCH 7/7] CMake: work around strange install behavior --- ng/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ng/CMakeLists.txt b/ng/CMakeLists.txt index f413d4c2..23991339 100644 --- a/ng/CMakeLists.txt +++ b/ng/CMakeLists.txt @@ -65,7 +65,7 @@ if(USE_PYTHON) set_target_properties( ngpy PROPERTIES OUTPUT_NAME "libngpy") endif() set_target_properties(ngpy PROPERTIES INSTALL_RPATH "${NG_RPATH_TOKEN}/../${NETGEN_PYTHON_RPATH}") - install(TARGETS ngpy RUNTIME DESTINATION ${NG_INSTALL_DIR_PYTHON}/${NG_INSTALL_SUFFIX} LIBRARY DESTINATION ${NG_INSTALL_DIR_PYTHON}/${NG_INSTALL_SUFFIX} ARCHIVE DESTINATION ${NG_INSTALL_DIR_LIB} COMPONENT netgen) + install(TARGETS ngpy DESTINATION ${NG_INSTALL_DIR_PYTHON}/${NG_INSTALL_SUFFIX} COMPONENT netgen) endif(USE_PYTHON) if(USE_GUI)