+ pull request 61

This commit is contained in:
wmayer 2016-03-14 23:07:20 +01:00
parent 711f34f5ae
commit 6ee243c2fa

View File

@ -6,6 +6,7 @@
# COIN3D_LIBRARIES - Link this to use Coin3D # COIN3D_LIBRARIES - Link this to use Coin3D
# #
SET( COIN3D_FOUND "NO" )
IF (WIN32) IF (WIN32)
IF (CYGWIN) IF (CYGWIN)
@ -69,7 +70,11 @@ ELSE (WIN32)
) )
SET(COIN3D_LIBRARIES "-framework Coin3d" CACHE STRING "Coin3D library for OSX") SET(COIN3D_LIBRARIES "-framework Coin3d" CACHE STRING "Coin3D library for OSX")
ELSE(APPLE) ELSE(APPLE)
# Try to use pkg-config first...
find_package(PkgConfig)
pkg_check_modules(COIN3D Coin)
# ... then fall back to manual lookup
IF(NOT COIN3D_FOUND)
FIND_PATH(COIN3D_INCLUDE_DIRS Inventor/So.h FIND_PATH(COIN3D_INCLUDE_DIRS Inventor/So.h
/usr/include/Coin3 /usr/include/Coin3
/usr/include /usr/include
@ -82,12 +87,12 @@ ELSE (WIN32)
/usr/local/lib /usr/local/lib
PATH_SUFFIXES Coin2 Coin3 PATH_SUFFIXES Coin2 Coin3
) )
ENDIF(NOT COIN3D_FOUND)
ENDIF(APPLE) ENDIF(APPLE)
ENDIF (WIN32) ENDIF (WIN32)
SET( COIN3D_FOUND "NO" )
IF(COIN3D_LIBRARIES) IF(COIN3D_LIBRARIES)
SET( COIN3D_FOUND "YES" ) SET( COIN3D_FOUND "YES" )
ENDIF(COIN3D_LIBRARIES) ENDIF(COIN3D_LIBRARIES)