From 64955ba01a45980fc3a4fa42d30f50c8a2ae53b0 Mon Sep 17 00:00:00 2001 From: Simone Bna <s.bn@cineca.it> Date: Tue, 26 Jun 2018 17:54:43 +0200 Subject: [PATCH] ENH: added install command to cmake script - LIBRARY_OUTPUT_PATH is removed - CMAKE_LIBRARY_OUTPUT_DIRECTORY is used instead of LIBRARY_OUTPUT_PATH - CMAKE_INSTALL_PREFIX is used as install destination --- src/catalyst/CMakeLists-Catalyst.txt | 8 ++------ src/catalyst/CMakeLists.txt | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/catalyst/CMakeLists-Catalyst.txt b/src/catalyst/CMakeLists-Catalyst.txt index d0068c9..00cf60e 100644 --- a/src/catalyst/CMakeLists-Catalyst.txt +++ b/src/catalyst/CMakeLists-Catalyst.txt @@ -49,12 +49,6 @@ link_directories( set(CMAKE_BUILD_TYPE Release) -set(LIBRARY_OUTPUT_PATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} - CACHE INTERNAL - "" -) - - file(GLOB SOURCE_FILES catalystCoprocess.C catalystTools.C @@ -107,4 +101,6 @@ target_link_libraries( ${OPENFOAM_LIBRARIES} ) +install(TARGETS catalystFoam DESTINATION lib) + #----------------------------------------------------------------------------- diff --git a/src/catalyst/CMakeLists.txt b/src/catalyst/CMakeLists.txt index edfa5ad..cc6c408 100644 --- a/src/catalyst/CMakeLists.txt +++ b/src/catalyst/CMakeLists.txt @@ -46,6 +46,7 @@ if (NOT PARAVIEW_USE_MPI) message(WARNING "==== Recommended to build using ParaView Catalyst with MPI ====") endif() message("install libdir = ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") +message("install installdir = ${CMAKE_INSTALL_PREFIX}") message("================") -- GitLab