From 9b54c926fe11d40860c858285fcc5a96010450db Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Mon, 17 May 2010 21:19:07 +0000 Subject: [PATCH] Adds LIB_SUFFIX to all CMakeLists install "lib" targets, so that 64 bits libraries gets installed in "lib64" instead of "lib". buildCoriolis.py sets automatically LIB_SUFFIX for cmake. coriolis2.spec modificated to uses lib64 on 64 bits. --- hurricane/src/hurricane/CMakeLists.txt | 2 +- hurricane/src/isobar/CMakeLists.txt | 4 ++-- hurricane/src/viewer/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hurricane/src/hurricane/CMakeLists.txt b/hurricane/src/hurricane/CMakeLists.txt index 8d90386f..69ab2ac0 100644 --- a/hurricane/src/hurricane/CMakeLists.txt +++ b/hurricane/src/hurricane/CMakeLists.txt @@ -151,5 +151,5 @@ ) add_library ( hurricane ${cpps} ) - install ( TARGETS hurricane DESTINATION lib) + install ( TARGETS hurricane DESTINATION lib${LIB_SUFFIX} ) install ( FILES ${includes} DESTINATION include/hurricane ) diff --git a/hurricane/src/isobar/CMakeLists.txt b/hurricane/src/isobar/CMakeLists.txt index 0a084b9b..9e4bd461 100644 --- a/hurricane/src/isobar/CMakeLists.txt +++ b/hurricane/src/isobar/CMakeLists.txt @@ -92,5 +92,5 @@ ) target_link_libraries ( Hurricane isobar hurricane ${PYTHON_LIBRARIES} ) - install ( TARGETS isobar DESTINATION lib ) - install ( TARGETS Hurricane DESTINATION lib/python ) + install ( TARGETS isobar DESTINATION lib${LIB_SUFFIX} ) + install ( TARGETS Hurricane DESTINATION lib${LIB_SUFFIX}/python ) diff --git a/hurricane/src/viewer/CMakeLists.txt b/hurricane/src/viewer/CMakeLists.txt index ea9bf384..e83f8d29 100644 --- a/hurricane/src/viewer/CMakeLists.txt +++ b/hurricane/src/viewer/CMakeLists.txt @@ -116,4 +116,4 @@ ${QT_LIBRARIES} # ${Boost_LIBRARIES} ) - install ( TARGETS viewer DESTINATION lib ) + install ( TARGETS viewer DESTINATION lib${LIB_SUFFIX} )