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

Fixes #729 Removed useless SOLID_SOLIDINCLUDE_DIR variable

Browse source 
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 2012-08-30 18:12:11 +00:00
parent aff22327af
commit 9861448370
2 changed files with 73 additions and 83 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cmake/Find3rdPartyDependencies.cmake
View file

@ -97,12 +97,6 @@ MACRO(_FIND_3RDPARTY_DEPENDENCIES ROOT_DIR)
_FIND_3RDPARTY_DEPENDENCY(SOLID_SOLID SOLID/solid.h "" "solid" ${ROOT_DIR} "") _FIND_3RDPARTY_DEPENDENCY(SOLID_SOLID SOLID/solid.h "" "solid" ${ROOT_DIR} "")
_FIND_3RDPARTY_DEPENDENCY(SOLID_BROAD SOLID/broad.h "" "broad" ${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) ENDIF(OPTION_3RDPARTY_SOLID)
_FIND_3RDPARTY_DEPENDENCY(JPEG jpeglib.h "" jpeg_s ${ROOT_DIR} "") _FIND_3RDPARTY_DEPENDENCY(JPEG jpeglib.h "" jpeg_s ${ROOT_DIR} "")

12
cmake/FindSOLID.cmake
View file

@ -40,17 +40,17 @@ ENDIF(PKGCONFIG_FOUND)
# Then try the good old way for include dirs. # Then try the good old way for include dirs.
IF(NOT APPLE) IF(NOT APPLE)
FIND_PATH(SOLID_SOLIDINCLUDE_DIR SOLID/solid.h FIND_PATH(SOLID_INCLUDE_DIR SOLID/solid.h
HINTS ENV SOLID_DIR HINTS ENV SOLID_DIR
PATH_SUFFIXES PATH_SUFFIXES
include/FreeSOLID include/freesolid include/SOLID include include/FreeSOLID include/freesolid include/SOLID include
PATHS PATHS
/usr /usr/local /usr /usr/local
DOC "Non-Apple location of SOLID") DOC "Non-Apple include dir for SOLID")
ELSE(NOT APPLE) ELSE(NOT APPLE)
FIND_PATH(SOLID_SOLIDINCLUDE_DIR solid.h FIND_PATH(SOLID_INCLUDE_DIR solid.h
HINTS ENV SOLID_DIR HINTS ENV SOLID_DIR
PATH_SUFFIXES PATH_SUFFIXES
Headers include/FreeSOLID include/freesolid include/SOLID include Headers include/FreeSOLID include/freesolid include/SOLID include
@ -61,12 +61,10 @@ ELSE(NOT APPLE)
/System/Library/Frameworks/SOLID.framework # Tiger /System/Library/Frameworks/SOLID.framework # Tiger
/usr /usr/local /usr /usr/local
DOC "Apple location of SOLID") DOC "Apple include dir for SOLID")
ENDIF(NOT APPLE) ENDIF(NOT APPLE)
SET(SOLID_INCLUDE_DIR ${SOLID_SOLIDINCLUDE_DIR} CACHE DOC "Include dir for SOLID")
# 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 NAMES solid
@ -98,5 +96,3 @@ ELSE(SOLID_FOUND)
MESSAGE(FATAL_ERROR "Could not find SOLID") MESSAGE(FATAL_ERROR "Could not find SOLID")
ENDIF(SOLID_FOUND) ENDIF(SOLID_FOUND)
MARK_AS_ADVANCED(SOLID_SOLIDINCLUDE_DIR)