xavi
/
speed-dreams
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allow use of new solid2 lib 

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6074 30fe4595-0a0c-4342-8851-515496e4dcbd
This commit is contained in:
beaglejoe 2015-08-17 16:11:15 +00:00
parent 32d88d9368
commit 67c9946c32
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cmake/FindSOLID.cmake
View File

@ -67,11 +67,12 @@ ENDIF(NOT APPLE)
# Then try the good old way for libs.
FIND_LIBRARY(SOLID_SOLID_LIBRARY
NAMES solid FreeSOLID freesolid
NAMES solid2 solid FreeSOLID freesolid
HINTS ENV SOLID_DIR
PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
PATHS /usr /usr/local)
#MESSAGE(STATUS "Looking for SOLID --- SOLID_SOLID_LIBRARY = ${SOLID_SOLID_LIBRARY}")
IF(WIN32)
FIND_LIBRARY(SOLID_BROAD_LIBRARY
@ -82,16 +83,16 @@ IF(WIN32)
ENDIF(WIN32)
IF(SOLID_INCLUDE_DIR AND SOLID_SOLID_LIBRARY AND (NOT WIN32 OR SOLID_BROAD_LIBRARY))
IF(SOLID_INCLUDE_DIR AND SOLID_SOLID_LIBRARY)
SET(SOLID_FOUND TRUE)
ENDIF(SOLID_INCLUDE_DIR AND SOLID_SOLID_LIBRARY AND (NOT WIN32 OR SOLID_BROAD_LIBRARY))
ENDIF(SOLID_INCLUDE_DIR AND SOLID_SOLID_LIBRARY)
IF(SOLID_FOUND)
MESSAGE(STATUS "Looking for SOLID - found (${SOLID_SOLID_LIBRARY})")
SET(SOLID_LIBRARY ${SOLID_SOLID_LIBRARY})
IF(WIN32)
IF(WIN32 AND SOLID_BROAD_LIBRARY)
SET(SOLID_LIBRARY ${SOLID_LIBRARY} ${SOLID_BROAD_LIBRARY})
ENDIF(WIN32)
ENDIF(WIN32 AND SOLID_BROAD_LIBRARY)
ELSE(SOLID_FOUND)
MESSAGE(FATAL_ERROR "Could not find SOLID")
ENDIF(SOLID_FOUND)

13
cmake/customthirdparty.cmake
View File

@ -179,8 +179,8 @@ MACRO(_FIND_3RDPARTY_DEPENDENCIES ROOT_DIR)
# FreeSOLID : Replaces bundled modules/simu/.../SOLID2.0 (that will soon be removed).
IF(OPTION_3RDPARTY_SOLID)
_FIND_3RDPARTY_DEPENDENCY(SOLID SOLID/solid.h ".;FreeSOLID" "solid;broad" ${ROOT_DIR} "")
_FIND_3RDPARTY_DEPENDENCY(SOLID_SOLID SOLID/solid.h ".;FreeSOLID" "solid" ${ROOT_DIR} "")
_FIND_3RDPARTY_DEPENDENCY(SOLID SOLID/solid.h ".;FreeSOLID" "solid2;solid;broad" ${ROOT_DIR} "")
_FIND_3RDPARTY_DEPENDENCY(SOLID_SOLID SOLID/solid.h ".;FreeSOLID" "solid2;solid" ${ROOT_DIR} "")
_FIND_3RDPARTY_DEPENDENCY(SOLID_BROAD SOLID/broad.h ".;FreeSOLID" "broad" ${ROOT_DIR} "")
ENDIF(OPTION_3RDPARTY_SOLID)
@ -379,12 +379,13 @@ MACRO(SD_INSTALL_CUSTOM_3RDPARTY TARGET_NAME)
ENDIF(OPTION_OSGGRAPH)
IF(OPTION_3RDPARTY_SOLID)
_FIND_3RDPARTY_DLL("${SOLID_SOLID_LIBRARY}" "solid" "lib" _DLL_PATHNAME)
_FIND_3RDPARTY_DLL("${SOLID_SOLID_LIBRARY}" "solid2;solid" "lib" _DLL_PATHNAME)
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
_FIND_3RDPARTY_DLL("${SOLID_BROAD_LIBRARY}" "broad" "lib" _DLL_PATHNAME)
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
IF(SOLID_BROAD_LIBRARY)
_FIND_3RDPARTY_DLL("${SOLID_BROAD_LIBRARY}" "broad" "lib" _DLL_PATHNAME)
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
ENDIF(SOLID_BROAD_LIBRARY)
ENDIF(OPTION_3RDPARTY_SOLID)