jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Jean-Paul Chaput 2020-03-19 18:18:35 +01:00
parent b07a472250
commit 837de500aa
30 changed files with 53 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
anabatic/cmake_modules/FindANABATIC.cmake
View File

@ -26,7 +26,7 @@ IF(UNIX)
FIND_LIBRARY(ANABATIC_LIBRARY_PATH FIND_LIBRARY(ANABATIC_LIBRARY_PATH
NAMES anabatic NAMES anabatic
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${ANABATIC_INCLUDE_PATH_DESCRIPTION}" DOC "The ${ANABATIC_INCLUDE_PATH_DESCRIPTION}"
) )

6
bootstrap/cmake_modules/FindBootstrap.cmake
View File

@ -276,7 +276,8 @@
/usr/include /usr/include
PATH_SUFFIXES qwt ) PATH_SUFFIXES qwt )
find_library(QWT_LIBRARY NAMES qwt-qt5 qwt find_library(QWT_LIBRARY NAMES qwt-qt5 qwt
PATHS /usr/lib${LIB_SUFFIX} ) PATHS /usr/lib64
/usr/lib )
else() else()
find_path(QWT_INCLUDE_DIR NAMES qwt.h find_path(QWT_INCLUDE_DIR NAMES qwt.h
PATHS /usr/include/qwt-qt4 PATHS /usr/include/qwt-qt4
@ -286,7 +287,8 @@
PATH_SUFFIXES qwt ) PATH_SUFFIXES qwt )
find_library(QWT_LIBRARY NAMES qwt-qt4 qwt find_library(QWT_LIBRARY NAMES qwt-qt4 qwt
PATHS /opt/local/libexec/qt4/lib PATHS /opt/local/libexec/qt4/lib
/usr/lib${LIB_SUFFIX} ) /usr/lib64
/usr/lib )
endif() endif()
if( QWT_INCLUDE_DIR AND QWT_LIBRARY) if( QWT_INCLUDE_DIR AND QWT_LIBRARY)

2
bootstrap/cmake_modules/FindFLEX.cmake
View File

@ -63,7 +63,7 @@ FIND_PROGRAM(FLEX_EXECUTABLE flex DOC "path to the flex executable")
MARK_AS_ADVANCED(FLEX_EXECUTABLE) MARK_AS_ADVANCED(FLEX_EXECUTABLE)
FIND_LIBRARY(FL_LIBRARY NAMES fl 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}) SET(FLEX_LIBRARIES ${FL_LIBRARY})
IF(FLEX_EXECUTABLE) IF(FLEX_EXECUTABLE)

2
bootstrap/cmake_modules/FindLEFDEF.cmake
View File

@ -92,7 +92,7 @@
find_path( LEFDEF_LIBRARY_DIR NAMES "libdef.so" find_path( LEFDEF_LIBRARY_DIR NAMES "libdef.so"
PATHS ${LEFDEF_SEARCH_PATH} PATHS ${LEFDEF_SEARCH_PATH}
PATH_SUFFIXES "lib${LIB_SUFFIX}" PATH_SUFFIXES "lib64 lib"
DOC "The ${LEFDEF_LIBRARY_DIR_DESCRIPTION}" ) DOC "The ${LEFDEF_LIBRARY_DIR_DESCRIPTION}" )
message( STATUS "LEFDEF_LIBRARY_DIR: ${LEFDEF_LIBRARY_DIR}" ) message( STATUS "LEFDEF_LIBRARY_DIR: ${LEFDEF_LIBRARY_DIR}" )

2
bootstrap/docker/debian-9/Dockerfile.bash → bootstrap/docker/debian-10/Dockerfile.bash
View File

@ -1,5 +1,5 @@
FROM debian9.coriolis FROM debian10.coriolis
COPY root/dot.bashrc /root/.bashrc COPY root/dot.bashrc /root/.bashrc

4
bootstrap/docker/debian-9/Dockerfile.coriolis → bootstrap/docker/debian-10/Dockerfile.coriolis
View File

@ -1,10 +1,10 @@
FROM debian9.system FROM debian10.system
COPY root/socInstaller.py /root/socInstaller.py COPY root/socInstaller.py /root/socInstaller.py
RUN mkdir -p coriolis-2.x/src \ RUN mkdir -p coriolis-2.x/src \
&& git clone https://github.com/m-labs/nmigen.git \ && git clone https://github.com/m-labs/nmigen.git \
&& cd nmigen \ && cd nmigen \
&& python3 setup.py develop \ && 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

7
bootstrap/docker/debian-9/Dockerfile.system → bootstrap/docker/debian-10/Dockerfile.system
View File

@ -1,5 +1,5 @@
FROM debian:stretch-slim FROM debian:buster-slim
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
@ -19,3 +19,8 @@ RUN apt-get update \
vim \ vim \
&& apt-get clean && 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

4
bootstrap/docker/debian-10/docker-conf.sh Normal file
View File

@ -0,0 +1,4 @@
systemImage="debian10.system"
coriolisImage="debian10.coriolis"
bashImage="debian10.bash"

0
bootstrap/docker/debian-9/root/allianceInstaller.sh → bootstrap/docker/debian-10/root/allianceInstaller.sh
View File

0
bootstrap/docker/debian-9/root/dot.bashrc → bootstrap/docker/debian-10/root/dot.bashrc
View File

0
bootstrap/docker/debian-9/root/socInstaller.py → bootstrap/docker/debian-10/root/socInstaller.py
View File

4
bootstrap/docker/debian-9/docker-conf.sh
View File

@ -1,4 +0,0 @@
systemImage="debian9.system"
coriolisImage="debian9.coriolis"
bashImage="debian9.bash"

2
bootstrap/socInstaller.py
View File

@ -440,7 +440,7 @@ class Configuration ( object ):
otherArgs.append( '--devtoolset=8' ) otherArgs.append( '--devtoolset=8' )
commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 6, otherArgs , fdLog=self.fds['coriolis'] ) ) 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'] ) ) 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' ) if target == 'Ubuntu18': otherArgs.append( '--qt5' )
commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 3, otherArgs, fdLog=self.fds['coriolis'] ) ) commands.append( CoriolisCommand( self.ccbBin, self.rootDir, 3, otherArgs, fdLog=self.fds['coriolis'] ) )

2
coloquinte/cmake_modules/FindCOLOQUINTE.cmake
View File

@ -26,7 +26,7 @@ IF(UNIX)
FIND_LIBRARY(COLOQUINTE_LIBRARY_PATH FIND_LIBRARY(COLOQUINTE_LIBRARY_PATH
NAMES coloquinte NAMES coloquinte
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${COLOQUINTE_INCLUDE_PATH_DESCRIPTION}" DOC "The ${COLOQUINTE_INCLUDE_PATH_DESCRIPTION}"
) )

6
crlcore/cmake_modules/FindCORIOLIS.cmake
View File

@ -26,7 +26,7 @@ IF(UNIX)
FIND_LIBRARY(CRLCORE_LIBRARY_PATH FIND_LIBRARY(CRLCORE_LIBRARY_PATH
NAMES crlcore NAMES crlcore
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${CORIOLIS_INCLUDE_PATH_DESCRIPTION}" DOC "The ${CORIOLIS_INCLUDE_PATH_DESCRIPTION}"
) )
@ -34,7 +34,7 @@ IF(UNIX)
FIND_LIBRARY(LIBMANAGER_LIBRARY_PATH FIND_LIBRARY(LIBMANAGER_LIBRARY_PATH
NAMES libmanager NAMES libmanager
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${CORIOLIS_INCLUDE_PATH_DESCRIPTION}" DOC "The ${CORIOLIS_INCLUDE_PATH_DESCRIPTION}"
) )
@ -50,7 +50,7 @@ IF(UNIX)
FIND_LIBRARY(CORIOLIS_PYTHON_LIBRARY_PATH FIND_LIBRARY(CORIOLIS_PYTHON_LIBRARY_PATH
NAMES pycrlcore NAMES pycrlcore
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "${CORIOLIS_LIBRARY_PATH_DESCRIPTION}" DOC "${CORIOLIS_LIBRARY_PATH_DESCRIPTION}"
) )

2
crlcore/src/ccore/alliance/vst/VstParserGrammar.yy
View File

@ -1405,7 +1405,7 @@ void vstParser ( const string cellPath, Cell *cell )
, Catalog::State::Views , Catalog::State::Views
, Vst::states->_state->getDepth()-1) ) { , Vst::states->_state->getDepth()-1) ) {
throw Error ( "CParsVst() VHDL Parser:\n" 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() , getString(Vst::states->_cellQueue.front()).c_str()
); );
} }

4
equinox/cmake_modules/FindEQUINOX.cmake
View File

@ -26,7 +26,7 @@ IF(UNIX)
FIND_LIBRARY(EQUINOX_LIBRARY_PATH FIND_LIBRARY(EQUINOX_LIBRARY_PATH
NAMES equinox NAMES equinox
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${EQUINOX_INCLUDE_PATH_DESCRIPTION}" DOC "The ${EQUINOX_INCLUDE_PATH_DESCRIPTION}"
) )
@ -34,7 +34,7 @@ IF(UNIX)
FIND_LIBRARY(INTERVALTREE_LIBRARY_PATH FIND_LIBRARY(INTERVALTREE_LIBRARY_PATH
NAMES intervalTree NAMES intervalTree
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${EQUINOX_INCLUDE_PATH_DESCRIPTION}" DOC "The ${EQUINOX_INCLUDE_PATH_DESCRIPTION}"
) )

2
etesian/cmake_modules/FindETESIAN.cmake
View File

@ -26,7 +26,7 @@ IF(UNIX)
FIND_LIBRARY(ETESIAN_LIBRARY_PATH FIND_LIBRARY(ETESIAN_LIBRARY_PATH
NAMES etesian NAMES etesian
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${ETESIAN_INCLUDE_PATH_DESCRIPTION}" DOC "The ${ETESIAN_INCLUDE_PATH_DESCRIPTION}"
) )

2
flute/cmake_modules/FindFLUTE.cmake
View File

@ -21,7 +21,7 @@ if( UNIX )
find_library( FLUTE_LIBRARY_PATH NAMES flute find_library( FLUTE_LIBRARY_PATH NAMES flute
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
DOC "${FLUTE_INCLUDE_PATH_DESCRIPTION}" DOC "${FLUTE_INCLUDE_PATH_DESCRIPTION}"
) )

8
hurricane/cmake_modules/FindHURRICANE.cmake
View File

@ -28,7 +28,7 @@ IF(UNIX)
FIND_LIBRARY(HURRICANE_LIBRARY_PATH FIND_LIBRARY(HURRICANE_LIBRARY_PATH
NAMES hurricane NAMES hurricane
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}"
) )
@ -44,7 +44,7 @@ IF(UNIX)
FIND_LIBRARY(HURRICANE_ANALOG_LIBRARY_PATH FIND_LIBRARY(HURRICANE_ANALOG_LIBRARY_PATH
NAMES analog NAMES analog
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}"
) )
@ -60,7 +60,7 @@ IF(UNIX)
FIND_LIBRARY(HURRICANE_PYTHON_LIBRARY_PATH FIND_LIBRARY(HURRICANE_PYTHON_LIBRARY_PATH
NAMES isobar NAMES isobar
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}"
) )
@ -76,7 +76,7 @@ IF(UNIX)
FIND_LIBRARY(HURRICANE_VIEWER_LIBRARY_PATH FIND_LIBRARY(HURRICANE_VIEWER_LIBRARY_PATH
NAMES viewer NAMES viewer
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}" DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}"
) )

2
katabatic/cmake_modules/FindKATABATIC.cmake
View File

@ -26,7 +26,7 @@ IF(UNIX)
FIND_LIBRARY(KATABATIC_LIBRARY_PATH FIND_LIBRARY(KATABATIC_LIBRARY_PATH
NAMES katabatic NAMES katabatic
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${KATABATIC_INCLUDE_PATH_DESCRIPTION}" DOC "The ${KATABATIC_INCLUDE_PATH_DESCRIPTION}"
) )

2
katana/cmake_modules/FindKATANA.cmake
View File

@ -26,7 +26,7 @@ IF(UNIX)
FIND_LIBRARY(KATANA_LIBRARY_PATH FIND_LIBRARY(KATANA_LIBRARY_PATH
NAMES katana NAMES katana
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${KATANA_INCLUDE_PATH_DESCRIPTION}" DOC "The ${KATANA_INCLUDE_PATH_DESCRIPTION}"
) )

2
kite/cmake_modules/FindKITE.cmake
View File

@ -26,7 +26,7 @@ IF(UNIX)
FIND_LIBRARY(KITE_LIBRARY_PATH FIND_LIBRARY(KITE_LIBRARY_PATH
NAMES kite NAMES kite
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${KITE_INCLUDE_PATH_DESCRIPTION}" DOC "The ${KITE_INCLUDE_PATH_DESCRIPTION}"
) )

4
knik/cmake_modules/FindKNIK.cmake
View File

@ -26,7 +26,7 @@ IF(UNIX)
FIND_LIBRARY(KNIK_LIBRARY_PATH FIND_LIBRARY(KNIK_LIBRARY_PATH
NAMES knik NAMES knik
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${KNIK_INCLUDE_PATH_DESCRIPTION}" DOC "The ${KNIK_INCLUDE_PATH_DESCRIPTION}"
) )
@ -34,7 +34,7 @@ IF(UNIX)
FIND_LIBRARY(FLUTE_LIBRARY_PATH FIND_LIBRARY(FLUTE_LIBRARY_PATH
NAMES flute NAMES flute
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${KNIK_INCLUDE_PATH_DESCRIPTION}" DOC "The ${KNIK_INCLUDE_PATH_DESCRIPTION}"
) )

2
mauka/cmake_modules/FindMAUKA.cmake
View File

@ -26,7 +26,7 @@ IF(UNIX)
FIND_LIBRARY(MAUKA_LIBRARY_PATH FIND_LIBRARY(MAUKA_LIBRARY_PATH
NAMES mauka NAMES mauka
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${MAUKA_INCLUDE_PATH_DESCRIPTION}" DOC "The ${MAUKA_INCLUDE_PATH_DESCRIPTION}"
) )

4
metis/cmake_modules/FindMETIS.cmake
View File

@ -26,7 +26,7 @@ IF(UNIX)
FIND_LIBRARY(METIS_LIBRARY_PATH FIND_LIBRARY(METIS_LIBRARY_PATH
NAMES metis NAMES metis
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${METIS_INCLUDE_PATH_DESCRIPTION}" DOC "The ${METIS_INCLUDE_PATH_DESCRIPTION}"
) )
@ -36,7 +36,7 @@ IF(UNIX)
FIND_LIBRARY(HMETIS_LIBRARY_PATH FIND_LIBRARY(HMETIS_LIBRARY_PATH
NAMES hmetis NAMES hmetis
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${METIS_INCLUDE_PATH_DESCRIPTION}" DOC "The ${METIS_INCLUDE_PATH_DESCRIPTION}"
) )

2
nimbus/cmake_modules/FindNIMBUS.cmake
View File

@ -26,7 +26,7 @@ IF(UNIX)
FIND_LIBRARY(NIMBUS_LIBRARY_PATH FIND_LIBRARY(NIMBUS_LIBRARY_PATH
NAMES nimbus NAMES nimbus
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${NIMBUS_INCLUDE_PATH_DESCRIPTION}" DOC "The ${NIMBUS_INCLUDE_PATH_DESCRIPTION}"
) )

2
solstice/cmake_modules/FindSOLSTICE.cmake
View File

@ -26,7 +26,7 @@ IF(UNIX)
FIND_LIBRARY(SOLSTICE_LIBRARY_PATH FIND_LIBRARY(SOLSTICE_LIBRARY_PATH
NAMES solstice NAMES solstice
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${SOLSTICE_INCLUDE_PATH_DESCRIPTION}" DOC "The ${SOLSTICE_INCLUDE_PATH_DESCRIPTION}"
) )

2
unicorn/cmake_modules/FindUNICORN.cmake
View File

@ -26,7 +26,7 @@ IF(UNIX)
FIND_LIBRARY(UNICORN_LIBRARY_PATH FIND_LIBRARY(UNICORN_LIBRARY_PATH
NAMES unicorn NAMES unicorn
PATHS ${CORIOLIS_DIR_SEARCH} PATHS ${CORIOLIS_DIR_SEARCH}
PATH_SUFFIXES lib${LIB_SUFFIX} PATH_SUFFIXES lib64 lib
# Help the user find it if we cannot. # Help the user find it if we cannot.
DOC "The ${UNICORN_INCLUDE_PATH_DESCRIPTION}" DOC "The ${UNICORN_INCLUDE_PATH_DESCRIPTION}"
) )

16
vlsisapd/cmake_modules/FindVLSISAPD.cmake
View File

@ -13,49 +13,49 @@
# Utilities # Utilities
FIND_PATH (UTILITIES_INCLUDE_DIR NAMES vlsisapd/utilities/Path.h PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES include) 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) SET_FOUND (UTILITIES)
MESSAGE("-- Utilities: ${UTILITIES_LIBRARY}") MESSAGE("-- Utilities: ${UTILITIES_LIBRARY}")
# AGDS # AGDS
FIND_PATH (AGDS_INCLUDE_DIR NAMES vlsisapd/agds/GdsLibrary.h PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES include) 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) SET_FOUND (AGDS)
MESSAGE("-- AGDS: ${AGDS_LIBRARY}") MESSAGE("-- AGDS: ${AGDS_LIBRARY}")
# CIF # CIF
FIND_PATH (CIF_INCLUDE_DIR NAMES vlsisapd/cif/Circuit.h PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES include) 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) SET_FOUND (CIF)
MESSAGE("-- Cif: ${CIF_LIBRARY}") MESSAGE("-- Cif: ${CIF_LIBRARY}")
# OPENCHAMS # OPENCHAMS
FIND_PATH (OPENCHAMS_INCLUDE_DIR NAMES vlsisapd/openChams/Circuit.h PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES include) 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) SET_FOUND (OPENCHAMS)
MESSAGE("-- OPENCHAMS: ${OPENCHAMS_LIBRARY}") MESSAGE("-- OPENCHAMS: ${OPENCHAMS_LIBRARY}")
# DTR # DTR
FIND_PATH (DTR_INCLUDE_DIR NAMES vlsisapd/dtr/Techno.h PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES include) 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) SET_FOUND (DTR)
MESSAGE("-- DTR: ${DTR_LIBRARY}") MESSAGE("-- DTR: ${DTR_LIBRARY}")
# SPICE # SPICE
FIND_PATH (SPICE_INCLUDE_DIR NAMES vlsisapd/spice/Circuit.h PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES include) 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) SET_FOUND (SPICE)
MESSAGE("-- SPICE: ${SPICE_LIBRARY}") MESSAGE("-- SPICE: ${SPICE_LIBRARY}")
# Bookshelf # Bookshelf
FIND_PATH (BOOKSHELF_INCLUDE_DIR NAMES vlsisapd/bookshelf/Circuit.h PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES include) 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) SET_FOUND (BOOKSHELF)
MESSAGE("-- Bookshelf: ${BOOKSHELF_LIBRARY}") MESSAGE("-- Bookshelf: ${BOOKSHELF_LIBRARY}")
# Configuration # Configuration
FIND_PATH (CONFIGURATION_INCLUDE_DIR NAMES vlsisapd/configuration/ConfigurationWidget.h PATHS ${CORIOLIS_DIR_SEARCH} PATH_SUFFIXES include) 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) SET_FOUND (CONFIGURATION)
MESSAGE("-- Configuration: ${CONFIGURATION_LIBRARY}") MESSAGE("-- Configuration: ${CONFIGURATION_LIBRARY}")