From 97b15f0727d1ad4468f91111d6a4a9ca2f0fcb33 Mon Sep 17 00:00:00 2001 From: Denis Barbier Date: Thu, 20 May 2010 00:01:33 +0200 Subject: [PATCH 4/5] New cmake variables: GEOM_INSTALL_LIB_DIR, SMESH_INSTALL_LIB_DIR Default value is $CMAKE_INSTALL_PREFIX/lib. --- src/contrib/GEOM/CMakeLists.txt | 6 +++++- src/contrib/SMESH/CMakeLists.txt | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/contrib/GEOM/CMakeLists.txt b/src/contrib/GEOM/CMakeLists.txt index a487572..c39ae9f 100644 --- a/src/contrib/GEOM/CMakeLists.txt +++ b/src/contrib/GEOM/CMakeLists.txt @@ -117,6 +117,10 @@ TARGET_LINK_LIBRARIES(GEOM TKernel TKBRep TKBO TKMath ################################# # Install lib in /usr/local/lib # ################################# +IF(NOT GEOM_INSTALL_LIB_DIR) + SET(GEOM_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib) +ENDIF(NOT GEOM_INSTALL_LIB_DIR) + IF (UNIX) - INSTALL(TARGETS GEOM DESTINATION /usr/local/lib) + INSTALL(TARGETS GEOM DESTINATION ${GEOM_INSTALL_LIB_DIR}) ENDIF(UNIX) diff --git a/src/contrib/SMESH/CMakeLists.txt b/src/contrib/SMESH/CMakeLists.txt index 9871616..af68e42 100644 --- a/src/contrib/SMESH/CMakeLists.txt +++ b/src/contrib/SMESH/CMakeLists.txt @@ -148,6 +148,10 @@ ENDIF(WIN32) ################################# # Install lib in /usr/local/lib # ################################# +IF(NOT SMESH_INSTALL_LIB_DIR) + SET(SMESH_INSTALL_LIB_DIR ${CMAKE_INSTALL_PREFIX}/lib) +ENDIF(NOT SMESH_INSTALL_LIB_DIR) + IF (UNIX) - INSTALL(TARGETS SMESH DESTINATION /usr/local/lib) + INSTALL(TARGETS SMESH DESTINATION ${SMESH_INSTALL_LIB_DIR}) ENDIF(UNIX) -- 1.7.1