DELBERGUE Guillaume

Improve OS X support

Add missing paths to support OS X 64 bits

Signed-off-by: Guillaume Delbergue <guillaume.delbergue@greensocs.com>
... ... @@ -19,16 +19,19 @@ SET(_GREENLIB_HINTS
${GREENLIB_PREFIX}/lib-linux
${GREENLIB_PREFIX}/lib-linux64
${GREENLIB_PREFIX}/lib-macos
${GREENLIB_PREFIX}/lib-macosx64
$ENV{GREENLIB_PREFIX}/include
$ENV{GREENLIB_PREFIX}/lib
$ENV{GREENLIB_PREFIX}/lib-linux
$ENV{GREENLIB_PREFIX}/lib-linux64
$ENV{GREENLIB_PREFIX}/lib-macos
$ENV{GREENLIB_PREFIX}/lib-macosx64
${CMAKE_INSTALL_PREFIX}/include
${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_INSTALL_PREFIX}/lib-linux
${CMAKE_INSTALL_PREFIX}/lib-linux64
${CMAKE_INSTALL_PREFIX}/lib-macos
${CMAKE_INSTALL_PREFIX}/lib-macosx64
)
# Hard-coded guesses should still go in PATHS. This ensures that the user
# environment can always override hard guesses.
... ... @@ -38,10 +41,12 @@ SET(_GREENLIB_PATHS
/usr/lib-linux
/usr/lib-linux64
/usr/lib-macos
/usr/lib-macosx64
/usr/local/lib
/usr/local/lib-linux
/usr/local/lib-linux64
/usr/local/lib-macos
/usr/local/lib-macosx64
)
FIND_PATH(GREENLIB_INCLUDE_DIRS
... ...
... ... @@ -36,16 +36,19 @@ SET(_SYSTEMC_HINTS
${SYSTEMC_PREFIX}/lib-linux
${SYSTEMC_PREFIX}/lib-linux64
${SYSTEMC_PREFIX}/lib-macos
${SYSTEMC_PREFIX}/lib-macosx64
$ENV{SYSTEMC_PREFIX}/include
$ENV{SYSTEMC_PREFIX}/lib
$ENV{SYSTEMC_PREFIX}/lib-linux
$ENV{SYSTEMC_PREFIX}/lib-linux64
$ENV{SYSTEMC_PREFIX}/lib-macos
$ENV{SYSTEMC_PREFIX}/lib-macosx64
${CMAKE_INSTALL_PREFIX}/include
${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_INSTALL_PREFIX}/lib-linux
${CMAKE_INSTALL_PREFIX}/lib-linux64
${CMAKE_INSTALL_PREFIX}/lib-macos
${CMAKE_INSTALL_PREFIX}/lib-macosx64
)
# Hard-coded guesses should still go in PATHS. This ensures that the user
# environment can always override hard guesses.
... ... @@ -55,10 +58,12 @@ SET(_SYSTEMC_PATHS
/usr/lib-linux
/usr/lib-linux64
/usr/lib-macos
/usr/lib-macosx64
/usr/local/lib
/usr/local/lib-linux
/usr/local/lib-linux64
/usr/local/lib-macos
/usr/local/lib-macosx64
)
FIND_FILE(_SYSTEMC_VERSION_FILE
NAMES sc_ver.h
... ...
... ... @@ -41,16 +41,19 @@ SET(_TLM_HINTS
${SYSTEMC_PREFIX}/lib-linux
${SYSTEMC_PREFIX}/lib-linux64
${SYSTEMC_PREFIX}/lib-macos
${SYSTEMC_PREFIX}/lib-macosx64
$ENV{SYSTEMC_PREFIX}/include
$ENV{SYSTEMC_PREFIX}/lib
$ENV{SYSTEMC_PREFIX}/lib-linux
$ENV{SYSTEMC_PREFIX}/lib-linux64
$ENV{SYSTEMC_PREFIX}/lib-macos
$ENV{SYSTEMC_PREFIX}/lib-macosx64
${CMAKE_INSTALL_PREFIX}/include
${CMAKE_INSTALL_PREFIX}/lib
${CMAKE_INSTALL_PREFIX}/lib-linux
${CMAKE_INSTALL_PREFIX}/lib-linux64
${CMAKE_INSTALL_PREFIX}/lib-macos
${CMAKE_INSTALL_PREFIX}/lib-macosx64
)
# Hard-coded guesses should still go in PATHS. This ensures that the user
# environment can always override hard guesses.
... ... @@ -61,10 +64,12 @@ SET(_TLM_PATHS
/usr/lib-linux
/usr/lib-linux64
/usr/lib-macos
/usr/lib-macosx64
/usr/local/lib
/usr/local/lib-linux
/usr/local/lib-linux64
/usr/local/lib-macos
/usr/local/lib-macosx64
)
FIND_PATH(TLM_INCLUDE_DIRS
... ...