From 837de500aa2f1ce674142c44cf74f05a928ba430 Mon Sep 17 00:00:00 2001 From: Jean-Paul Chaput Date: Thu, 19 Mar 2020 18:18:35 +0100 Subject: [PATCH] Compliance with Debian 10 Buster. * Change: In all tools, FindTOOL.cmake, no longer use LIB_SUFFIX to search for tool libraries but try "lib64/" then "lib/". * Change: In bootstrap/socInstaller.py, take Debian 10 into account. * Change: In bootstrap/docker, move from Debian 9 to Debian 10. --- anabatic/cmake_modules/FindANABATIC.cmake | 2 +- bootstrap/cmake_modules/FindBootstrap.cmake | 6 ++++-- bootstrap/cmake_modules/FindFLEX.cmake | 2 +- bootstrap/cmake_modules/FindLEFDEF.cmake | 2 +- .../{debian-9 => debian-10}/Dockerfile.bash | 2 +- .../{debian-9 => debian-10}/Dockerfile.coriolis | 4 ++-- .../{debian-9 => debian-10}/Dockerfile.system | 7 ++++++- bootstrap/docker/debian-10/docker-conf.sh | 4 ++++ .../root/allianceInstaller.sh | 0 .../{debian-9 => debian-10}/root/dot.bashrc | 0 .../{debian-9 => debian-10}/root/socInstaller.py | 0 bootstrap/docker/debian-9/docker-conf.sh | 4 ---- bootstrap/socInstaller.py | 2 +- coloquinte/cmake_modules/FindCOLOQUINTE.cmake | 2 +- crlcore/cmake_modules/FindCORIOLIS.cmake | 6 +++--- .../src/ccore/alliance/vst/VstParserGrammar.yy | 2 +- equinox/cmake_modules/FindEQUINOX.cmake | 4 ++-- etesian/cmake_modules/FindETESIAN.cmake | 2 +- flute/cmake_modules/FindFLUTE.cmake | 2 +- hurricane/cmake_modules/FindHURRICANE.cmake | 8 ++++---- katabatic/cmake_modules/FindKATABATIC.cmake | 2 +- katana/cmake_modules/FindKATANA.cmake | 2 +- kite/cmake_modules/FindKITE.cmake | 2 +- knik/cmake_modules/FindKNIK.cmake | 4 ++-- mauka/cmake_modules/FindMAUKA.cmake | 2 +- metis/cmake_modules/FindMETIS.cmake | 4 ++-- nimbus/cmake_modules/FindNIMBUS.cmake | 2 +- solstice/cmake_modules/FindSOLSTICE.cmake | 2 +- unicorn/cmake_modules/FindUNICORN.cmake | 2 +- vlsisapd/cmake_modules/FindVLSISAPD.cmake | 16 ++++++++-------- 30 files changed, 53 insertions(+), 46 deletions(-) rename bootstrap/docker/{debian-9 => debian-10}/Dockerfile.bash (73%) rename bootstrap/docker/{debian-9 => debian-10}/Dockerfile.coriolis (71%) rename bootstrap/docker/{debian-9 => debian-10}/Dockerfile.system (80%) create mode 100644 bootstrap/docker/debian-10/docker-conf.sh rename bootstrap/docker/{debian-9 => debian-10}/root/allianceInstaller.sh (100%) rename bootstrap/docker/{debian-9 => debian-10}/root/dot.bashrc (100%) rename bootstrap/docker/{debian-9 => debian-10}/root/socInstaller.py (100%) delete mode 100644 bootstrap/docker/debian-9/docker-conf.sh diff --git a/anabatic/cmake_modules/FindANABATIC.cmake b/anabatic/cmake_modules/FindANABATIC.cmake index 2c56eabc..340b9800 100644 --- a/anabatic/cmake_modules/FindANABATIC.cmake +++ b/anabatic/cmake_modules/FindANABATIC.cmake @@ -26,7 +26,7 @@ IF(UNIX) FIND_LIBRARY(ANABATIC_LIBRARY_PATH NAMES anabatic PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${ANABATIC_INCLUDE_PATH_DESCRIPTION}" ) diff --git a/bootstrap/cmake_modules/FindBootstrap.cmake b/bootstrap/cmake_modules/FindBootstrap.cmake index 5e51c3cd..ff6182f9 100644 --- a/bootstrap/cmake_modules/FindBootstrap.cmake +++ b/bootstrap/cmake_modules/FindBootstrap.cmake @@ -276,7 +276,8 @@ /usr/include PATH_SUFFIXES qwt ) find_library(QWT_LIBRARY NAMES qwt-qt5 qwt - PATHS /usr/lib${LIB_SUFFIX} ) + PATHS /usr/lib64 + /usr/lib ) else() find_path(QWT_INCLUDE_DIR NAMES qwt.h PATHS /usr/include/qwt-qt4 @@ -286,7 +287,8 @@ PATH_SUFFIXES qwt ) find_library(QWT_LIBRARY NAMES qwt-qt4 qwt PATHS /opt/local/libexec/qt4/lib - /usr/lib${LIB_SUFFIX} ) + /usr/lib64 + /usr/lib ) endif() if( QWT_INCLUDE_DIR AND QWT_LIBRARY) diff --git a/bootstrap/cmake_modules/FindFLEX.cmake b/bootstrap/cmake_modules/FindFLEX.cmake index 643191f0..67cbb73f 100644 --- a/bootstrap/cmake_modules/FindFLEX.cmake +++ b/bootstrap/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${LIB_SUFFIX} DOC "path to the fl library") + PATHS /usr/lib64 lib DOC "path to the fl library") SET(FLEX_LIBRARIES ${FL_LIBRARY}) IF(FLEX_EXECUTABLE) diff --git a/bootstrap/cmake_modules/FindLEFDEF.cmake b/bootstrap/cmake_modules/FindLEFDEF.cmake index 6598a372..1af1bf49 100644 --- a/bootstrap/cmake_modules/FindLEFDEF.cmake +++ b/bootstrap/cmake_modules/FindLEFDEF.cmake @@ -92,7 +92,7 @@ find_path( LEFDEF_LIBRARY_DIR NAMES "libdef.so" PATHS ${LEFDEF_SEARCH_PATH} - PATH_SUFFIXES "lib${LIB_SUFFIX}" + PATH_SUFFIXES "lib64 lib" DOC "The ${LEFDEF_LIBRARY_DIR_DESCRIPTION}" ) message( STATUS "LEFDEF_LIBRARY_DIR: ${LEFDEF_LIBRARY_DIR}" ) diff --git a/bootstrap/docker/debian-9/Dockerfile.bash b/bootstrap/docker/debian-10/Dockerfile.bash similarity index 73% rename from bootstrap/docker/debian-9/Dockerfile.bash rename to bootstrap/docker/debian-10/Dockerfile.bash index 9f936374..ff029cf4 100644 --- a/bootstrap/docker/debian-9/Dockerfile.bash +++ b/bootstrap/docker/debian-10/Dockerfile.bash @@ -1,5 +1,5 @@ -FROM debian9.coriolis +FROM debian10.coriolis COPY root/dot.bashrc /root/.bashrc diff --git a/bootstrap/docker/debian-9/Dockerfile.coriolis b/bootstrap/docker/debian-10/Dockerfile.coriolis similarity index 71% rename from bootstrap/docker/debian-9/Dockerfile.coriolis rename to bootstrap/docker/debian-10/Dockerfile.coriolis index 278a21c2..23f52b5c 100644 --- a/bootstrap/docker/debian-9/Dockerfile.coriolis +++ b/bootstrap/docker/debian-10/Dockerfile.coriolis @@ -1,10 +1,10 @@ -FROM debian9.system +FROM debian10.system COPY root/socInstaller.py /root/socInstaller.py RUN mkdir -p coriolis-2.x/src \ && git clone https://github.com/m-labs/nmigen.git \ && cd nmigen \ && python3 setup.py develop \ - && /root/socInstaller.py --docker --profile=Debian9 --do-alliance --do-coriolis --benchs + && /root/socInstaller.py --docker --profile=Debian10 --do-alliance --do-coriolis --benchs diff --git a/bootstrap/docker/debian-9/Dockerfile.system b/bootstrap/docker/debian-10/Dockerfile.system similarity index 80% rename from bootstrap/docker/debian-9/Dockerfile.system rename to bootstrap/docker/debian-10/Dockerfile.system index f7b9b58f..22571c5e 100644 --- a/bootstrap/docker/debian-9/Dockerfile.system +++ b/bootstrap/docker/debian-10/Dockerfile.system @@ -1,5 +1,5 @@ -FROM debian:stretch-slim +FROM debian:buster-slim ENV DEBIAN_FRONTEND=noninteractive @@ -19,3 +19,8 @@ RUN apt-get update \ vim \ && apt-get clean +# If you want to build Alliance documentation, install those LaTeX +# packages: +# transfig texlive texlive-latex-extra +# texlive-plain-generic texlive-pictures +# imagemagick diff --git a/bootstrap/docker/debian-10/docker-conf.sh b/bootstrap/docker/debian-10/docker-conf.sh new file mode 100644 index 00000000..e06a4ace --- /dev/null +++ b/bootstrap/docker/debian-10/docker-conf.sh @@ -0,0 +1,4 @@ + + systemImage="debian10.system" + coriolisImage="debian10.coriolis" + bashImage="debian10.bash" diff --git a/bootstrap/docker/debian-9/root/allianceInstaller.sh b/bootstrap/docker/debian-10/root/allianceInstaller.sh similarity index 100% rename from bootstrap/docker/debian-9/root/allianceInstaller.sh rename to bootstrap/docker/debian-10/root/allianceInstaller.sh diff --git a/bootstrap/docker/debian-9/root/dot.bashrc b/bootstrap/docker/debian-10/root/dot.bashrc similarity index 100% rename from bootstrap/docker/debian-9/root/dot.bashrc rename to bootstrap/docker/debian-10/root/dot.bashrc diff --git a/bootstrap/docker/debian-9/root/socInstaller.py b/bootstrap/docker/debian-10/root/socInstaller.py similarity index 100% rename from bootstrap/docker/debian-9/root/socInstaller.py rename to bootstrap/docker/debian-10/root/socInstaller.py diff --git a/bootstrap/docker/debian-9/docker-conf.sh b/bootstrap/docker/debian-9/docker-conf.sh deleted file mode 100644 index 4cca36c0..00000000 --- a/bootstrap/docker/debian-9/docker-conf.sh +++ /dev/null @@ -1,4 +0,0 @@ - - systemImage="debian9.system" - coriolisImage="debian9.coriolis" - bashImage="debian9.bash" diff --git a/bootstrap/socInstaller.py b/bootstrap/socInstaller.py index 592a562f..36d9c840 100755 --- a/bootstrap/socInstaller.py +++ b/bootstrap/socInstaller.py @@ -440,7 +440,7 @@ class Configuration ( object ): otherArgs.append( '--devtoolset=8' ) commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 6, otherArgs , fdLog=self.fds['coriolis'] ) ) commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 1, otherArgs+['--doc'], fdLog=self.fds['coriolis'] ) ) - elif target == 'Ubuntu18' or target == 'Debian9': + elif target == 'Ubuntu18' or target == 'Debian9' or target == 'Debian10': if target == 'Ubuntu18': otherArgs.append( '--qt5' ) commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 3, otherArgs, fdLog=self.fds['coriolis'] ) ) diff --git a/coloquinte/cmake_modules/FindCOLOQUINTE.cmake b/coloquinte/cmake_modules/FindCOLOQUINTE.cmake index 2787bd90..8a4d1516 100644 --- a/coloquinte/cmake_modules/FindCOLOQUINTE.cmake +++ b/coloquinte/cmake_modules/FindCOLOQUINTE.cmake @@ -26,7 +26,7 @@ IF(UNIX) FIND_LIBRARY(COLOQUINTE_LIBRARY_PATH NAMES coloquinte PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${COLOQUINTE_INCLUDE_PATH_DESCRIPTION}" ) diff --git a/crlcore/cmake_modules/FindCORIOLIS.cmake b/crlcore/cmake_modules/FindCORIOLIS.cmake index 3d09209e..d630ae0b 100644 --- a/crlcore/cmake_modules/FindCORIOLIS.cmake +++ b/crlcore/cmake_modules/FindCORIOLIS.cmake @@ -26,7 +26,7 @@ IF(UNIX) FIND_LIBRARY(CRLCORE_LIBRARY_PATH NAMES crlcore PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${CORIOLIS_INCLUDE_PATH_DESCRIPTION}" ) @@ -34,7 +34,7 @@ IF(UNIX) FIND_LIBRARY(LIBMANAGER_LIBRARY_PATH NAMES libmanager PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${CORIOLIS_INCLUDE_PATH_DESCRIPTION}" ) @@ -50,7 +50,7 @@ IF(UNIX) FIND_LIBRARY(CORIOLIS_PYTHON_LIBRARY_PATH NAMES pycrlcore PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "${CORIOLIS_LIBRARY_PATH_DESCRIPTION}" ) diff --git a/crlcore/src/ccore/alliance/vst/VstParserGrammar.yy b/crlcore/src/ccore/alliance/vst/VstParserGrammar.yy index 52ed8b38..7467c25b 100644 --- a/crlcore/src/ccore/alliance/vst/VstParserGrammar.yy +++ b/crlcore/src/ccore/alliance/vst/VstParserGrammar.yy @@ -1405,7 +1405,7 @@ void vstParser ( const string cellPath, Cell *cell ) , Catalog::State::Views , Vst::states->_state->getDepth()-1) ) { throw Error ( "CParsVst() VHDL Parser:\n" - " Unable to find cell \"%s\", please check your <.coriolis2/settings.py>.\n" + " Unable to find cell \"%s\", please check your <./coriolis2/settings.py>.\n" , getString(Vst::states->_cellQueue.front()).c_str() ); } diff --git a/equinox/cmake_modules/FindEQUINOX.cmake b/equinox/cmake_modules/FindEQUINOX.cmake index cbfa0b8b..bd2196c2 100644 --- a/equinox/cmake_modules/FindEQUINOX.cmake +++ b/equinox/cmake_modules/FindEQUINOX.cmake @@ -26,7 +26,7 @@ IF(UNIX) FIND_LIBRARY(EQUINOX_LIBRARY_PATH NAMES equinox PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${EQUINOX_INCLUDE_PATH_DESCRIPTION}" ) @@ -34,7 +34,7 @@ IF(UNIX) FIND_LIBRARY(INTERVALTREE_LIBRARY_PATH NAMES intervalTree PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${EQUINOX_INCLUDE_PATH_DESCRIPTION}" ) diff --git a/etesian/cmake_modules/FindETESIAN.cmake b/etesian/cmake_modules/FindETESIAN.cmake index 1aa2963b..6607478a 100644 --- a/etesian/cmake_modules/FindETESIAN.cmake +++ b/etesian/cmake_modules/FindETESIAN.cmake @@ -26,7 +26,7 @@ IF(UNIX) FIND_LIBRARY(ETESIAN_LIBRARY_PATH NAMES etesian PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${ETESIAN_INCLUDE_PATH_DESCRIPTION}" ) diff --git a/flute/cmake_modules/FindFLUTE.cmake b/flute/cmake_modules/FindFLUTE.cmake index 81fd8433..0e8d910b 100644 --- a/flute/cmake_modules/FindFLUTE.cmake +++ b/flute/cmake_modules/FindFLUTE.cmake @@ -21,7 +21,7 @@ if( UNIX ) find_library( FLUTE_LIBRARY_PATH NAMES flute PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib DOC "${FLUTE_INCLUDE_PATH_DESCRIPTION}" ) diff --git a/hurricane/cmake_modules/FindHURRICANE.cmake b/hurricane/cmake_modules/FindHURRICANE.cmake index 75db8bc7..6e535452 100644 --- a/hurricane/cmake_modules/FindHURRICANE.cmake +++ b/hurricane/cmake_modules/FindHURRICANE.cmake @@ -28,7 +28,7 @@ IF(UNIX) FIND_LIBRARY(HURRICANE_LIBRARY_PATH NAMES hurricane PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" ) @@ -44,7 +44,7 @@ IF(UNIX) FIND_LIBRARY(HURRICANE_ANALOG_LIBRARY_PATH NAMES analog PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" ) @@ -60,7 +60,7 @@ IF(UNIX) FIND_LIBRARY(HURRICANE_PYTHON_LIBRARY_PATH NAMES isobar PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" ) @@ -76,7 +76,7 @@ IF(UNIX) FIND_LIBRARY(HURRICANE_VIEWER_LIBRARY_PATH NAMES viewer PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" ) diff --git a/katabatic/cmake_modules/FindKATABATIC.cmake b/katabatic/cmake_modules/FindKATABATIC.cmake index 436048b0..3421298b 100644 --- a/katabatic/cmake_modules/FindKATABATIC.cmake +++ b/katabatic/cmake_modules/FindKATABATIC.cmake @@ -26,7 +26,7 @@ IF(UNIX) FIND_LIBRARY(KATABATIC_LIBRARY_PATH NAMES katabatic PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${KATABATIC_INCLUDE_PATH_DESCRIPTION}" ) diff --git a/katana/cmake_modules/FindKATANA.cmake b/katana/cmake_modules/FindKATANA.cmake index 955ee52c..0b579749 100644 --- a/katana/cmake_modules/FindKATANA.cmake +++ b/katana/cmake_modules/FindKATANA.cmake @@ -26,7 +26,7 @@ IF(UNIX) FIND_LIBRARY(KATANA_LIBRARY_PATH NAMES katana PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${KATANA_INCLUDE_PATH_DESCRIPTION}" ) diff --git a/kite/cmake_modules/FindKITE.cmake b/kite/cmake_modules/FindKITE.cmake index d5a7a3fb..d103d841 100644 --- a/kite/cmake_modules/FindKITE.cmake +++ b/kite/cmake_modules/FindKITE.cmake @@ -26,7 +26,7 @@ IF(UNIX) FIND_LIBRARY(KITE_LIBRARY_PATH NAMES kite PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${KITE_INCLUDE_PATH_DESCRIPTION}" ) diff --git a/knik/cmake_modules/FindKNIK.cmake b/knik/cmake_modules/FindKNIK.cmake index 57354451..f7a3e496 100644 --- a/knik/cmake_modules/FindKNIK.cmake +++ b/knik/cmake_modules/FindKNIK.cmake @@ -26,7 +26,7 @@ IF(UNIX) FIND_LIBRARY(KNIK_LIBRARY_PATH NAMES knik PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${KNIK_INCLUDE_PATH_DESCRIPTION}" ) @@ -34,7 +34,7 @@ IF(UNIX) FIND_LIBRARY(FLUTE_LIBRARY_PATH NAMES flute PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${KNIK_INCLUDE_PATH_DESCRIPTION}" ) diff --git a/mauka/cmake_modules/FindMAUKA.cmake b/mauka/cmake_modules/FindMAUKA.cmake index 6928efc1..1fa27e56 100644 --- a/mauka/cmake_modules/FindMAUKA.cmake +++ b/mauka/cmake_modules/FindMAUKA.cmake @@ -26,7 +26,7 @@ IF(UNIX) FIND_LIBRARY(MAUKA_LIBRARY_PATH NAMES mauka PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${MAUKA_INCLUDE_PATH_DESCRIPTION}" ) diff --git a/metis/cmake_modules/FindMETIS.cmake b/metis/cmake_modules/FindMETIS.cmake index 7481bdcf..f2431655 100644 --- a/metis/cmake_modules/FindMETIS.cmake +++ b/metis/cmake_modules/FindMETIS.cmake @@ -26,7 +26,7 @@ IF(UNIX) FIND_LIBRARY(METIS_LIBRARY_PATH NAMES metis PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${METIS_INCLUDE_PATH_DESCRIPTION}" ) @@ -36,7 +36,7 @@ IF(UNIX) FIND_LIBRARY(HMETIS_LIBRARY_PATH NAMES hmetis PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${METIS_INCLUDE_PATH_DESCRIPTION}" ) diff --git a/nimbus/cmake_modules/FindNIMBUS.cmake b/nimbus/cmake_modules/FindNIMBUS.cmake index dfa1e24c..fba6a1f7 100644 --- a/nimbus/cmake_modules/FindNIMBUS.cmake +++ b/nimbus/cmake_modules/FindNIMBUS.cmake @@ -26,7 +26,7 @@ IF(UNIX) FIND_LIBRARY(NIMBUS_LIBRARY_PATH NAMES nimbus PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${NIMBUS_INCLUDE_PATH_DESCRIPTION}" ) diff --git a/solstice/cmake_modules/FindSOLSTICE.cmake b/solstice/cmake_modules/FindSOLSTICE.cmake index cd6be87a..e66b3e18 100644 --- a/solstice/cmake_modules/FindSOLSTICE.cmake +++ b/solstice/cmake_modules/FindSOLSTICE.cmake @@ -26,7 +26,7 @@ IF(UNIX) FIND_LIBRARY(SOLSTICE_LIBRARY_PATH NAMES solstice PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${SOLSTICE_INCLUDE_PATH_DESCRIPTION}" ) diff --git a/unicorn/cmake_modules/FindUNICORN.cmake b/unicorn/cmake_modules/FindUNICORN.cmake index e11d96dc..1e12c04d 100644 --- a/unicorn/cmake_modules/FindUNICORN.cmake +++ b/unicorn/cmake_modules/FindUNICORN.cmake @@ -26,7 +26,7 @@ IF(UNIX) FIND_LIBRARY(UNICORN_LIBRARY_PATH NAMES unicorn PATHS ${CORIOLIS_DIR_SEARCH} - PATH_SUFFIXES lib${LIB_SUFFIX} + PATH_SUFFIXES lib64 lib # Help the user find it if we cannot. DOC "The ${UNICORN_INCLUDE_PATH_DESCRIPTION}" ) diff --git a/vlsisapd/cmake_modules/FindVLSISAPD.cmake b/vlsisapd/cmake_modules/FindVLSISAPD.cmake index af82620f..35621cc1 100644 --- a/vlsisapd/cmake_modules/FindVLSISAPD.cmake +++ b/vlsisapd/cmake_modules/FindVLSISAPD.cmake @@ -13,49 +13,49 @@ # Utilities FIND_PATH (UTILITIES_INCLUDE_DIR NAMES vlsisapd/utilities/Path.h PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES include) - FIND_LIBRARY(UTILITIES_LIBRARY NAMES vlsisapdutils PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib${LIB_SUFFIX}) + FIND_LIBRARY(UTILITIES_LIBRARY NAMES vlsisapdutils PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib64 lib) SET_FOUND (UTILITIES) MESSAGE("-- Utilities: ${UTILITIES_LIBRARY}") # AGDS FIND_PATH (AGDS_INCLUDE_DIR NAMES vlsisapd/agds/GdsLibrary.h PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES include) - FIND_LIBRARY(AGDS_LIBRARY NAMES agds PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib${LIB_SUFFIX}) + FIND_LIBRARY(AGDS_LIBRARY NAMES agds PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib64 lib) SET_FOUND (AGDS) MESSAGE("-- AGDS: ${AGDS_LIBRARY}") # CIF FIND_PATH (CIF_INCLUDE_DIR NAMES vlsisapd/cif/Circuit.h PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES include) - FIND_LIBRARY(CIF_LIBRARY NAMES cif PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib${LIB_SUFFIX}) + FIND_LIBRARY(CIF_LIBRARY NAMES cif PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib64 lib) SET_FOUND (CIF) MESSAGE("-- Cif: ${CIF_LIBRARY}") # OPENCHAMS FIND_PATH (OPENCHAMS_INCLUDE_DIR NAMES vlsisapd/openChams/Circuit.h PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES include) - FIND_LIBRARY(OPENCHAMS_LIBRARY NAMES openChams PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib${LIB_SUFFIX}) + FIND_LIBRARY(OPENCHAMS_LIBRARY NAMES openChams PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib64 lib) SET_FOUND (OPENCHAMS) MESSAGE("-- OPENCHAMS: ${OPENCHAMS_LIBRARY}") # DTR FIND_PATH (DTR_INCLUDE_DIR NAMES vlsisapd/dtr/Techno.h PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES include) - FIND_LIBRARY(DTR_LIBRARY NAMES dtr PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib${LIB_SUFFIX}) + FIND_LIBRARY(DTR_LIBRARY NAMES dtr PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib64 lib) SET_FOUND (DTR) MESSAGE("-- DTR: ${DTR_LIBRARY}") # SPICE FIND_PATH (SPICE_INCLUDE_DIR NAMES vlsisapd/spice/Circuit.h PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES include) - FIND_LIBRARY(SPICE_LIBRARY NAMES spice PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib${LIB_SUFFIX}) + FIND_LIBRARY(SPICE_LIBRARY NAMES spice PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib64 lib) SET_FOUND (SPICE) MESSAGE("-- SPICE: ${SPICE_LIBRARY}") # Bookshelf FIND_PATH (BOOKSHELF_INCLUDE_DIR NAMES vlsisapd/bookshelf/Circuit.h PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES include) - FIND_LIBRARY(BOOKSHELF_LIBRARY NAMES bookshelf PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib${LIB_SUFFIX}) + FIND_LIBRARY(BOOKSHELF_LIBRARY NAMES bookshelf PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib64 lib) SET_FOUND (BOOKSHELF) MESSAGE("-- Bookshelf: ${BOOKSHELF_LIBRARY}") # Configuration FIND_PATH (CONFIGURATION_INCLUDE_DIR NAMES vlsisapd/configuration/ConfigurationWidget.h PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES include) - FIND_LIBRARY(CONFIGURATION_LIBRARY NAMES configuration PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib${LIB_SUFFIX}) + FIND_LIBRARY(CONFIGURATION_LIBRARY NAMES configuration PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES lib64 lib) SET_FOUND (CONFIGURATION) MESSAGE("-- Configuration: ${CONFIGURATION_LIBRARY}")