forked from speed-dreams/speed-dreams-code
Fixes #729 Removed useless SOLID_SOLIDINCLUDE_DIR variable
git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@4906 30fe4595-0a0c-4342-8851-515496e4dcbd Former-commit-id: 44ed2181117f8fbd967ad4108e09c636337af82d Former-commit-id: 07ef84751e8ba55f051c874bd1bde3cbb4070616
This commit is contained in:
pouillot
parent
aff22327af
commit
9861448370
2 changed files with 73 additions and 83 deletions
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
MACRO(_FIND_3RDPARTY_DEPENDENCY DEP_NAME INCLUDE_FILE INCLUDE_SUBDIRS LIBRARY_NAMES SEARCH_PATH_LIST DEBUG_SUFFIX)
|
||||
|
||||
#MESSAGE(STATUS "Searching for 3rd party dependency DEP_NAME='${DEP_NAME}' INCLUDE_FILE='${INCLUDE_FILE}' INCLUDE_SUBDIRS='${INCLUDE_SUBDIRS}' LIBRARY_NAMES='${LIBRARY_NAMES}' SEARCH_PATH_LIST='${SEARCH_PATH_LIST}' DEBUG_SUFFIX='${DEBUG_SUFFIX}' ...")
|
||||
#MESSAGE(STATUS "Searching for 3rd party dependency DEP_NAME='${DEP_NAME}' INCLUDE_FILE='${INCLUDE_FILE}' INCLUDE_SUBDIRS='${INCLUDE_SUBDIRS}' LIBRARY_NAMES='${LIBRARY_NAMES}' SEARCH_PATH_LIST='${SEARCH_PATH_LIST}' DEBUG_SUFFIX='${DEBUG_SUFFIX}' ...")
|
||||
|
||||
# Convert possibly a simple string to a real list.
|
||||
SET(_INCLUDE_SUBDIRS)
|
||||
|
|
@ -13,8 +13,8 @@ MACRO(_FIND_3RDPARTY_DEPENDENCY DEP_NAME INCLUDE_FILE INCLUDE_SUBDIRS LIBRARY_NA
|
|||
#MESSAGE(STATUS "_INCLUDE_SUBDIRS=${_INCLUDE_SUBDIRS}, _NB_DIRS=${_NB_DIRS}")
|
||||
|
||||
# Find include dirs
|
||||
SET(MY_PATH_INCLUDE )
|
||||
FOREACH(MY_PATH ${SEARCH_PATH_LIST} )
|
||||
SET(MY_PATH_INCLUDE )
|
||||
FOREACH(MY_PATH ${SEARCH_PATH_LIST} )
|
||||
IF(${_NB_DIRS} GREATER 0)
|
||||
FOREACH(MY_SUBDIR ${_INCLUDE_SUBDIRS} )
|
||||
#MESSAGE(STATUS "MY_PATH='${MY_PATH}', MY_SUBDIR='${MY_SUBDIR}'")
|
||||
|
|
@ -26,66 +26,66 @@ MACRO(_FIND_3RDPARTY_DEPENDENCY DEP_NAME INCLUDE_FILE INCLUDE_SUBDIRS LIBRARY_NA
|
|||
ELSE(${_NB_DIRS} GREATER 0)
|
||||
SET(MY_PATH_INCLUDE ${MY_PATH_INCLUDE} ${MY_PATH}/include)
|
||||
ENDIF(${_NB_DIRS} GREATER 0)
|
||||
ENDFOREACH(MY_PATH ${SEARCH_PATH_LIST} )
|
||||
ENDFOREACH(MY_PATH ${SEARCH_PATH_LIST} )
|
||||
|
||||
#MESSAGE(STATUS "MY_PATH_INCLUDE='${MY_PATH_INCLUDE}'")
|
||||
FIND_PATH("${DEP_NAME}_INCLUDE_DIR" ${INCLUDE_FILE}
|
||||
${MY_PATH_INCLUDE}
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
MARK_AS_ADVANCED("${DEP_NAME}_INCLUDE_DIR")
|
||||
#MESSAGE(STATUS " ${DEP_NAME}_INCLUDE_DIR = '${${DEP_NAME}_INCLUDE_DIR}'")
|
||||
FIND_PATH("${DEP_NAME}_INCLUDE_DIR" ${INCLUDE_FILE}
|
||||
${MY_PATH_INCLUDE}
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
MARK_AS_ADVANCED("${DEP_NAME}_INCLUDE_DIR")
|
||||
#MESSAGE(STATUS " ${DEP_NAME}_INCLUDE_DIR = '${${DEP_NAME}_INCLUDE_DIR}'")
|
||||
|
||||
# Find library files
|
||||
SET(MY_PATH_LIB )
|
||||
FOREACH(MY_PATH ${SEARCH_PATH_LIST} )
|
||||
SET(MY_PATH_LIB )
|
||||
FOREACH(MY_PATH ${SEARCH_PATH_LIST} )
|
||||
SET(MY_PATH_LIB ${MY_PATH_LIB} ${MY_PATH}/lib)
|
||||
ENDFOREACH(MY_PATH ${SEARCH_PATH_LIST} )
|
||||
ENDFOREACH(MY_PATH ${SEARCH_PATH_LIST} )
|
||||
|
||||
#MESSAGE(STATUS "LIBRARY_NAMES='${LIBRARY_NAMES}', MY_PATH_LIB=${MY_PATH_LIB}")
|
||||
FIND_LIBRARY("${DEP_NAME}_LIBRARY"
|
||||
NAMES ${LIBRARY_NAMES}
|
||||
PATHS ${MY_PATH_LIB}
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
MARK_AS_ADVANCED("${DEP_NAME}_LIBRARY")
|
||||
#MESSAGE(STATUS " ${DEP_NAME}_LIBRARY = '${${DEP_NAME}_LIBRARY}'")
|
||||
FIND_LIBRARY("${DEP_NAME}_LIBRARY"
|
||||
NAMES ${LIBRARY_NAMES}
|
||||
PATHS ${MY_PATH_LIB}
|
||||
NO_DEFAULT_PATH
|
||||
)
|
||||
MARK_AS_ADVANCED("${DEP_NAME}_LIBRARY")
|
||||
#MESSAGE(STATUS " ${DEP_NAME}_LIBRARY = '${${DEP_NAME}_LIBRARY}'")
|
||||
|
||||
# Whatever happened, done.
|
||||
SET(${DEP_NAME}_FOUND "NO" )
|
||||
IF(${DEP_NAME}_INCLUDE_DIR AND ${DEP_NAME}_LIBRARY)
|
||||
SET( ${DEP_NAME}_FOUND "YES" )
|
||||
ENDIF(${DEP_NAME}_INCLUDE_DIR AND ${DEP_NAME}_LIBRARY)
|
||||
SET(${DEP_NAME}_FOUND "NO" )
|
||||
IF(${DEP_NAME}_INCLUDE_DIR AND ${DEP_NAME}_LIBRARY)
|
||||
SET( ${DEP_NAME}_FOUND "YES" )
|
||||
ENDIF(${DEP_NAME}_INCLUDE_DIR AND ${DEP_NAME}_LIBRARY)
|
||||
|
||||
ENDMACRO(_FIND_3RDPARTY_DEPENDENCY DEP_NAME INCLUDE_FILE INCLUDE_SUBDIRS LIBRARY_NAMES SEARCH_PATH_LIST DEBUG_SUFFIX)
|
||||
|
||||
|
||||
MACRO(_FIND_3RDPARTY_DEPENDENCIES ROOT_DIR)
|
||||
|
||||
_FIND_3RDPARTY_DEPENDENCY(SDL sdl.h "SDL;SDL2" sdl "${ROOT_DIR}" "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(SDLMAIN sdl_main.h "SDL;SDL2" sdlmain "${ROOT_DIR}" "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(SDL sdl.h "SDL;SDL2" sdl "${ROOT_DIR}" "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(SDLMAIN sdl_main.h "SDL;SDL2" sdlmain "${ROOT_DIR}" "")
|
||||
IF(SDL_FOUND) # Dirty hack to make FindPackage(SDL) work later.
|
||||
SET(SDL_LIBRARY_TEMP ${SDL_LIBRARY} CACHE FILEPATH "")
|
||||
ENDIF(SDL_FOUND)
|
||||
|
||||
_FIND_3RDPARTY_DEPENDENCY(PLIB plib/sg.h "" sg ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(PLIB_SSG plib/ssg.h "" ssg ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(PLIB_SG plib/sg.h "" sg ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(PLIB_SL plib/sl.h "" sl ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(PLIB_SSGAUX plib/ssgaux.h "" ssgaux ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(PLIB_UL plib/ul.h "" ul ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(PLIB_JS plib/js.h "" js ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(PLIB plib/sg.h "" sg ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(PLIB_SSG plib/ssg.h "" ssg ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(PLIB_SG plib/sg.h "" sg ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(PLIB_SL plib/sl.h "" sl ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(PLIB_SSGAUX plib/ssgaux.h "" ssgaux ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(PLIB_UL plib/ul.h "" ul ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(PLIB_JS plib/js.h "" js ${ROOT_DIR} "")
|
||||
|
||||
# Note: The Open GL includes are automatically added by MSVC 2005.
|
||||
# We simply add here the include path for the Open GL extensions headers,
|
||||
# and we use OPENGL_INCLUDE_DIR variable for this,
|
||||
# as Find_Package(OpenGL) doesn't seem to set it.
|
||||
# Note: The Open GL includes are automatically added by MSVC 2005.
|
||||
# We simply add here the include path for the Open GL extensions headers,
|
||||
# and we use OPENGL_INCLUDE_DIR variable for this,
|
||||
# as Find_Package(OpenGL) doesn't seem to set it.
|
||||
Find_Package(OpenGL)
|
||||
FIND_PATH(OPENGL_INCLUDE_DIR GL/glext.h ${ROOT_DIR}/include NO_DEFAULT_PATH)
|
||||
FIND_PATH(OPENGL_INCLUDE_DIR GL/glext.h ${ROOT_DIR}/include NO_DEFAULT_PATH)
|
||||
|
||||
_FIND_3RDPARTY_DEPENDENCY(OPENAL AL/al.h "" openal32 ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(OPENAL AL/al.h "" openal32 ${ROOT_DIR} "")
|
||||
|
||||
_FIND_3RDPARTY_DEPENDENCY(ENET enet/enet.h "" enet ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(ENET enet/enet.h "" enet ${ROOT_DIR} "")
|
||||
|
||||
IF(OPTION_3RDPARTY_EXPAT)
|
||||
_FIND_3RDPARTY_DEPENDENCY(EXPAT expat.h "" expat ${ROOT_DIR} "")
|
||||
|
|
@ -97,29 +97,23 @@ MACRO(_FIND_3RDPARTY_DEPENDENCIES ROOT_DIR)
|
|||
_FIND_3RDPARTY_DEPENDENCY(SOLID_SOLID SOLID/solid.h "" "solid" ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(SOLID_BROAD SOLID/broad.h "" "broad" ${ROOT_DIR} "")
|
||||
|
||||
IF(SOLID_FOUND)
|
||||
# Force subsequent FindSOLID stuff not to search for other variables ... kind of a hack
|
||||
SET(SOLID_SOLIDINCLUDE_DIR ${SOLID_INCLUDE_DIR} CACHE FILEPATH "")
|
||||
MARK_AS_ADVANCED(SOLID_SOLIDINCLUDE_DIR)
|
||||
ENDIF(SOLID_FOUND)
|
||||
|
||||
ENDIF(OPTION_3RDPARTY_SOLID)
|
||||
|
||||
_FIND_3RDPARTY_DEPENDENCY(JPEG jpeglib.h "" jpeg_s ${ROOT_DIR} "")
|
||||
_FIND_3RDPARTY_DEPENDENCY(JPEG jpeglib.h "" jpeg_s ${ROOT_DIR} "")
|
||||
|
||||
_FIND_3RDPARTY_DEPENDENCY(ZLIB zlib.h "" "z;zlib;zlib1" ${ROOT_DIR} "D")
|
||||
_FIND_3RDPARTY_DEPENDENCY(ZLIB zlib.h "" "z;zlib;zlib1" ${ROOT_DIR} "D")
|
||||
|
||||
IF(ZLIB_FOUND)
|
||||
IF(ZLIB_FOUND)
|
||||
|
||||
_FIND_3RDPARTY_DEPENDENCY(PNG png.h "" "libpng;libpng13;libpng14;libpng15;libpng16" ${ROOT_DIR} "D")
|
||||
_FIND_3RDPARTY_DEPENDENCY(PNG png.h "" "libpng;libpng13;libpng14;libpng15;libpng16" ${ROOT_DIR} "D")
|
||||
|
||||
IF(PNG_FOUND)
|
||||
# Force subsequent FindPNG stuff not to search for other variables ... kind of a hack
|
||||
SET(PNG_PNG_INCLUDE_DIR ${PNG_INCLUDE_DIR} CACHE FILEPATH "")
|
||||
MARK_AS_ADVANCED(PNG_PNG_INCLUDE_DIR)
|
||||
ENDIF(PNG_FOUND)
|
||||
IF(PNG_FOUND)
|
||||
# Force subsequent FindPNG stuff not to search for other variables ... kind of a hack
|
||||
SET(PNG_PNG_INCLUDE_DIR ${PNG_INCLUDE_DIR} CACHE FILEPATH "")
|
||||
MARK_AS_ADVANCED(PNG_PNG_INCLUDE_DIR)
|
||||
ENDIF(PNG_FOUND)
|
||||
|
||||
ENDIF(ZLIB_FOUND)
|
||||
ENDIF(ZLIB_FOUND)
|
||||
|
||||
ENDMACRO(_FIND_3RDPARTY_DEPENDENCIES ROOT_DIR)
|
||||
|
||||
|
|
@ -133,14 +127,14 @@ MACRO(SD_FIND_3RDPARTY)
|
|||
|
||||
IF(SDEXT_USE_CUSTOM_3DPARTY)
|
||||
|
||||
GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_SOURCE_DIR} PATH)
|
||||
SET(SDEXT_CUSTOM_3DPARTY_DIR "${PARENT_DIR}/3rdparty" CACHE PATH
|
||||
"Location of 3rdParty dependencies")
|
||||
IF(EXISTS ${SDEXT_CUSTOM_3DPARTY_DIR})
|
||||
_FIND_3RDPARTY_DEPENDENCIES(${SDEXT_CUSTOM_3DPARTY_DIR})
|
||||
GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_SOURCE_DIR} PATH)
|
||||
SET(SDEXT_CUSTOM_3DPARTY_DIR "${PARENT_DIR}/3rdparty" CACHE PATH
|
||||
"Location of 3rdParty dependencies")
|
||||
IF(EXISTS ${SDEXT_CUSTOM_3DPARTY_DIR})
|
||||
_FIND_3RDPARTY_DEPENDENCIES(${SDEXT_CUSTOM_3DPARTY_DIR})
|
||||
ENDIF(EXISTS ${SDEXT_CUSTOM_3DPARTY_DIR})
|
||||
|
||||
MARK_AS_ADVANCED(SDEXT_CUSTOM_3DPARTY_DIR)
|
||||
MARK_AS_ADVANCED(SDEXT_CUSTOM_3DPARTY_DIR)
|
||||
|
||||
ENDIF(SDEXT_USE_CUSTOM_3DPARTY)
|
||||
|
||||
|
|
@ -152,7 +146,7 @@ ENDMACRO(SD_FIND_3RDPARTY)
|
|||
|
||||
MACRO(_FIND_3RDPARTY_DLL PACKAGE_NAME LINK_LIBRARY NAME_HINTS DLL_PATHNAME_VAR)
|
||||
|
||||
FIND_PACKAGE(${PACKAGE_NAME})
|
||||
FIND_PACKAGE(${PACKAGE_NAME})
|
||||
|
||||
FOREACH(_LIB_NAME ${NAME_HINTS})
|
||||
|
||||
|
|
@ -166,7 +160,7 @@ MACRO(_FIND_3RDPARTY_DLL PACKAGE_NAME LINK_LIBRARY NAME_HINTS DLL_PATHNAME_VAR)
|
|||
ENDFOREACH(_LIB_PATHNAME_ ${LINK_LIBRARY})
|
||||
|
||||
# Got 1 link library pathname : check if any corresponding DLL around.
|
||||
GET_FILENAME_COMPONENT(_LIB_PATH "${_LIB_PATHNAME}" PATH)
|
||||
GET_FILENAME_COMPONENT(_LIB_PATH "${_LIB_PATHNAME}" PATH)
|
||||
SET(${DLL_PATHNAME_VAR} "${_LIB_PATH}/../bin/${_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}")
|
||||
#MESSAGE(STATUS "Trying 3rdParty DLL ${${DLL_PATHNAME_VAR}} for ${PACKAGE_NAME}")
|
||||
IF(NOT EXISTS "${${DLL_PATHNAME_VAR}}")
|
||||
|
|
@ -192,12 +186,12 @@ ENDMACRO(_FIND_3RDPARTY_DLL DLL_PATHNAME)
|
|||
|
||||
MACRO(SD_INSTALL_3RDPARTY)
|
||||
|
||||
SET(_THIRDPARTY_DLL_PATHNAMES)
|
||||
SET(_THIRDPARTY_DLL_PATHNAMES)
|
||||
|
||||
_FIND_3RDPARTY_DLL("OpenAL" "${OPENAL_LIBRARY}" "OpenAL32" _DLL_PATHNAME)
|
||||
_FIND_3RDPARTY_DLL("OpenAL" "${OPENAL_LIBRARY}" "OpenAL32" _DLL_PATHNAME)
|
||||
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
|
||||
|
||||
_FIND_3RDPARTY_DLL("SDL" "${SDL_LIBRARY}" "SDL" _DLL_PATHNAME)
|
||||
_FIND_3RDPARTY_DLL("SDL" "${SDL_LIBRARY}" "SDL" _DLL_PATHNAME)
|
||||
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
|
||||
|
||||
IF(OPTION_3RDPARTY_EXPAT)
|
||||
|
|
@ -217,13 +211,13 @@ MACRO(SD_INSTALL_3RDPARTY)
|
|||
|
||||
ENDIF(OPTION_3RDPARTY_SOLID)
|
||||
|
||||
_FIND_3RDPARTY_DLL("ZLIB" "${ZLIB_LIBRARY}" "zlib" _DLL_PATHNAME)
|
||||
_FIND_3RDPARTY_DLL("ZLIB" "${ZLIB_LIBRARY}" "zlib" _DLL_PATHNAME)
|
||||
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
|
||||
|
||||
_FIND_3RDPARTY_DLL("PNG" "${PNG_LIBRARY}" "png" _DLL_PATHNAME)
|
||||
_FIND_3RDPARTY_DLL("PNG" "${PNG_LIBRARY}" "png" _DLL_PATHNAME)
|
||||
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
|
||||
|
||||
_FIND_3RDPARTY_DLL("JPEG" "${JPEG_LIBRARY}" "jpeg-8" _DLL_PATHNAME)
|
||||
_FIND_3RDPARTY_DLL("JPEG" "${JPEG_LIBRARY}" "jpeg-8" _DLL_PATHNAME)
|
||||
LIST(APPEND _THIRDPARTY_DLL_PATHNAMES "${_DLL_PATHNAME}")
|
||||
|
||||
#MESSAGE(STATUS "3rdParty dependencies : Will install ${_THIRDPARTY_DLL_PATHNAMES}")
|
||||
|
|
|
|||
|
|
@ -40,17 +40,17 @@ ENDIF(PKGCONFIG_FOUND)
|
|||
# Then try the good old way for include dirs.
|
||||
IF(NOT APPLE)
|
||||
|
||||
FIND_PATH(SOLID_SOLIDINCLUDE_DIR SOLID/solid.h
|
||||
FIND_PATH(SOLID_INCLUDE_DIR SOLID/solid.h
|
||||
HINTS ENV SOLID_DIR
|
||||
PATH_SUFFIXES
|
||||
include/FreeSOLID include/freesolid include/SOLID include
|
||||
PATHS
|
||||
/usr /usr/local
|
||||
DOC "Non-Apple location of SOLID")
|
||||
DOC "Non-Apple include dir for SOLID")
|
||||
|
||||
ELSE(NOT APPLE)
|
||||
|
||||
FIND_PATH(SOLID_SOLIDINCLUDE_DIR solid.h
|
||||
FIND_PATH(SOLID_INCLUDE_DIR solid.h
|
||||
HINTS ENV SOLID_DIR
|
||||
PATH_SUFFIXES
|
||||
Headers include/FreeSOLID include/freesolid include/SOLID include
|
||||
|
|
@ -61,12 +61,10 @@ ELSE(NOT APPLE)
|
|||
/System/Library/Frameworks/SOLID.framework # Tiger
|
||||
|
||||
/usr /usr/local
|
||||
DOC "Apple location of SOLID")
|
||||
DOC "Apple include dir for SOLID")
|
||||
|
||||
ENDIF(NOT APPLE)
|
||||
|
||||
SET(SOLID_INCLUDE_DIR ${SOLID_SOLIDINCLUDE_DIR} CACHE DOC "Include dir for SOLID")
|
||||
|
||||
# Then try the good old way for libs.
|
||||
FIND_LIBRARY(SOLID_SOLID_LIBRARY
|
||||
NAMES solid
|
||||
|
|
@ -98,5 +96,3 @@ ELSE(SOLID_FOUND)
|
|||
MESSAGE(FATAL_ERROR "Could not find SOLID")
|
||||
ENDIF(SOLID_FOUND)
|
||||
|
||||
MARK_AS_ADVANCED(SOLID_SOLIDINCLUDE_DIR)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue