From 17294b0b345ab7945c22dc076438f3fde71b20b0 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Mon, 17 May 2010 21:19:04 +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. --- vlsisapd/agds/CMakeLists.txt | 2 +- vlsisapd/cif/CMakeLists.txt | 2 +- vlsisapd/dtr/src/CMakeLists.txt | 4 ++-- vlsisapd/openChams/CMakeLists.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vlsisapd/agds/CMakeLists.txt b/vlsisapd/agds/CMakeLists.txt index 2e5c5baa..a5f3e9a7 100644 --- a/vlsisapd/agds/CMakeLists.txt +++ b/vlsisapd/agds/CMakeLists.txt @@ -4,6 +4,6 @@ SET ( includes GdsLibrary.h GdsStructure.h GdsElement.h GdsRectangle.h ) SET ( cpps GdsLibrary.cpp GdsStructure.cpp GdsRectangle.cpp ) ADD_LIBRARY(agds ${cpps}) -INSTALL(TARGETS agds DESTINATION lib) +INSTALL(TARGETS agds DESTINATION lib${LIB_SUFFIX}) INSTALL(FILES ${includes} DESTINATION include/io/agds) diff --git a/vlsisapd/cif/CMakeLists.txt b/vlsisapd/cif/CMakeLists.txt index 988f1501..b17298b7 100644 --- a/vlsisapd/cif/CMakeLists.txt +++ b/vlsisapd/cif/CMakeLists.txt @@ -4,6 +4,6 @@ SET ( includes CifCircuit.h CifPolygon.h ) SET ( cpps CifCircuit.cpp CifPolygon.cpp ) ADD_LIBRARY(cif ${cpps}) -INSTALL(TARGETS cif DESTINATION lib) +INSTALL(TARGETS cif DESTINATION lib${LIB_SUFFIX}) INSTALL(FILES ${includes} DESTINATION include/io/cif) diff --git a/vlsisapd/dtr/src/CMakeLists.txt b/vlsisapd/dtr/src/CMakeLists.txt index 044c8522..96a2e3b6 100644 --- a/vlsisapd/dtr/src/CMakeLists.txt +++ b/vlsisapd/dtr/src/CMakeLists.txt @@ -21,7 +21,7 @@ SET ( pycpps PyTechno.cpp ${cpps}) ADD_LIBRARY(dtr ${cpps}) TARGET_LINK_LIBRARIES(dtr ${LIBXML2_LIBRARIES}) -INSTALL(TARGETS dtr DESTINATION lib) +INSTALL(TARGETS dtr DESTINATION lib${LIB_SUFFIX}) IF (Boost_FOUND) ADD_LIBRARY(pyDTR MODULE ${pycpps}) @@ -30,7 +30,7 @@ SET_TARGET_PROPERTIES(pyDTR PROPERTIES PREFIX "" ) TARGET_LINK_LIBRARIES(pyDTR dtr ${LIBXML2_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES}) -INSTALL(TARGETS pyDTR DESTINATION lib/python) +INSTALL(TARGETS pyDTR DESTINATION lib${LIB_SUFFIX}/python) ENDIF(Boost_FOUND) INSTALL(FILES ${hpps} DESTINATION include/io/dtr) diff --git a/vlsisapd/openChams/CMakeLists.txt b/vlsisapd/openChams/CMakeLists.txt index e5f89b12..70e0f95f 100644 --- a/vlsisapd/openChams/CMakeLists.txt +++ b/vlsisapd/openChams/CMakeLists.txt @@ -28,6 +28,6 @@ ADD_LIBRARY(openChams ${cpps}) TARGET_LINK_LIBRARIES(openChams ${LIBXML2_LIBRARIES}) -INSTALL(TARGETS openChams DESTINATION lib) +INSTALL(TARGETS openChams DESTINATION lib${LIB_SUFFIX} ) INSTALL(FILES ${includes} DESTINATION include/io/openChams)