iceflower/speed-dreams-code
1
0
Fork 0
forked from speed-dreams/speed-dreams-code
Code Pull requests Activity

Allow use of new solid2 lib

Browse source 
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@6074 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: e76b28082a919cefb17ee473cfb00b31367e5dcc
Former-commit-id: f7df0868ea5745d14abe2216aeebf8f3a566f58e
This commit is contained in:
beaglejoe 2015-08-17 16:11:15 +00:00
parent 3c7e6f02e8
commit 7c17847913
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. # Then try the good old way for libs.
FIND_LIBRARY(SOLID_SOLID_LIBRARY FIND_LIBRARY(SOLID_SOLID_LIBRARY
NAMES solid FreeSOLID freesolid NAMES solid2 solid FreeSOLID freesolid
HINTS ENV SOLID_DIR HINTS ENV SOLID_DIR
PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64 PATH_SUFFIXES lib64 lib libs64 libs libs/Win32 libs/Win64
PATHS /usr /usr/local) PATHS /usr /usr/local)
#MESSAGE(STATUS "Looking for SOLID --- SOLID_SOLID_LIBRARY = ${SOLID_SOLID_LIBRARY}")
IF(WIN32) IF(WIN32)
FIND_LIBRARY(SOLID_BROAD_LIBRARY FIND_LIBRARY(SOLID_BROAD_LIBRARY
@ -82,16 +83,16 @@ IF(WIN32)
ENDIF(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) 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) IF(SOLID_FOUND)
MESSAGE(STATUS "Looking for SOLID - found (${SOLID_SOLID_LIBRARY})") MESSAGE(STATUS "Looking for SOLID - found (${SOLID_SOLID_LIBRARY})")
SET(SOLID_LIBRARY ${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}) SET(SOLID_LIBRARY ${SOLID_LIBRARY} ${SOLID_BROAD_LIBRARY})
ENDIF(WIN32) ENDIF(WIN32 AND SOLID_BROAD_LIBRARY)
ELSE(SOLID_FOUND) ELSE(SOLID_FOUND)
MESSAGE(FATAL_ERROR "Could not find SOLID") MESSAGE(FATAL_ERROR "Could not find SOLID")
ENDIF(SOLID_FOUND) ENDIF(SOLID_FOUND)

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