From b9a97023d58f5b5b8cf9345815afaf590b7a3dbc Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Wed, 19 May 2010 14:31:01 +0000 Subject: [PATCH] * All tools: - Change: Adds ${LIB_SUFFIX} to all library search paths. --- hurricane/cmake_modules/FindFLEX.cmake | 2 +- hurricane/cmake_modules/FindHURRICANE.cmake | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/hurricane/cmake_modules/FindFLEX.cmake b/hurricane/cmake_modules/FindFLEX.cmake index 8eac2f96..643191f0 100644 --- a/hurricane/cmake_modules/FindFLEX.cmake +++ b/hurricane/cmake_modules/FindFLEX.cmake @@ -63,7 +63,7 @@ FIND_PROGRAM(FLEX_EXECUTABLE flex DOC "path to the flex executable") MARK_AS_ADVANCED(FLEX_EXECUTABLE) FIND_LIBRARY(FL_LIBRARY NAMES fl - PATHS /usr/lib DOC "path to the fl library") + PATHS /usr/lib${LIB_SUFFIX} DOC "path to the fl library") SET(FLEX_LIBRARIES ${FL_LIBRARY}) IF(FLEX_EXECUTABLE) diff --git a/hurricane/cmake_modules/FindHURRICANE.cmake b/hurricane/cmake_modules/FindHURRICANE.cmake index fa6e5afa..3521a1f6 100644 --- a/hurricane/cmake_modules/FindHURRICANE.cmake +++ b/hurricane/cmake_modules/FindHURRICANE.cmake @@ -95,7 +95,7 @@ IF(UNIX) FIND_LIBRARY(HURRICANE_LIBRARY_PATH NAMES hurricane PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib + PATH_SUFFIXES lib${LIB_SUFFIX} # Help the user find it if we cannot. DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" ) @@ -111,7 +111,7 @@ IF(UNIX) FIND_LIBRARY(HURRICANE_VIEWER_LIBRARY_PATH NAMES viewer PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib + PATH_SUFFIXES lib${LIB_SUFFIX} # Help the user find it if we cannot. DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" ) @@ -127,7 +127,7 @@ IF(UNIX) FIND_LIBRARY(HURRICANE_PYTHON_LIBRARY_PATH NAMES isobar PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib + PATH_SUFFIXES lib${LIB_SUFFIX} # Help the user find it if we cannot. DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" )