Permalink
Browse files

Fixed tabbing

  • Loading branch information...
osg-training-guest committed Apr 27, 2007
1 parent 2d9699a commit 9cdf1b21e260719d27efd49e074c48ecaa5f178f
@@ -5,44 +5,44 @@
MACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES SEARCHPATHLIST DEBUGSUFFIX)
- MESSAGE(STATUS "searching ${DEPNAME} -->${INCLUDEFILE}<-->${LIBRARY}<-->${SEARCHPATHLIST}<--")
-
- SET(MY_PATH_INCLUDE )
- SET(MY_PATH_LIB )
-
- FOREACH( MYPATH ${SEARCHPATHLIST} )
- SET(MY_PATH_INCLUDE ${MY_PATH_INCLUDE} ${MYPATH}/include)
- SET(MY_PATH_LIB ${MY_PATH_LIB} ${MYPATH}/lib)
- ENDFOREACH( MYPATH ${SEARCHPATHLIST} )
-
- FIND_PATH("${DEPNAME}_INCLUDE_DIR" ${INCLUDEFILE}
- ${MY_PATH_INCLUDE}
- )
- MARK_AS_ADVANCED("${DEPNAME}_INCLUDE_DIR")
- #MESSAGE( " ${DEPNAME}_INCLUDE_DIR --> ${${DEPNAME}_INCLUDE_DIR}<--")
-
- FIND_LIBRARY("${DEPNAME}_LIBRARY"
- NAMES ${LIBRARY_NAMES}
- PATHS ${MY_PATH_LIB}
- )
- SET(LIBRARY_NAMES_DEBUG "")
- FOREACH(LIBNAME ${LIBRARY_NAMES})
- LIST(APPEND LIBRARY_NAMES_DEBUG "${LIBNAME}${DEBUGSUFFIX}")
- ENDFOREACH(LIBNAME)
- FIND_LIBRARY("${DEPNAME}_LIBRARY_DEBUG"
- NAMES ${LIBRARY_NAMES_DEBUG}
- PATHS ${MY_PATH_LIB}
- )
- MARK_AS_ADVANCED("${DEPNAME}_LIBRARY")
- #MESSAGE( " ${DEPNAME}_LIBRARY --> ${${DEPNAME}_LIBRARY}<--")
- SET( ${DEPNAME}_FOUND "NO" )
- IF(${DEPNAME}_INCLUDE_DIR AND ${DEPNAME}_LIBRARY)
- SET( ${DEPNAME}_FOUND "YES" )
- IF(NOT ${DEPNAME}_LIBRARY_DEBUG)
- MESSAGE("-- Warning Debug ${DEPNAME} not found, using: ${${DEPNAME}_LIBRARY}")
- SET(${DEPNAME}_LIBRARY_DEBUG "${${DEPNAME}_LIBRARY}")
- ENDIF(NOT ${DEPNAME}_LIBRARY_DEBUG)
- ENDIF(${DEPNAME}_INCLUDE_DIR AND ${DEPNAME}_LIBRARY)
+ MESSAGE(STATUS "searching ${DEPNAME} -->${INCLUDEFILE}<-->${LIBRARY}<-->${SEARCHPATHLIST}<--")
+
+ SET(MY_PATH_INCLUDE )
+ SET(MY_PATH_LIB )
+
+ FOREACH( MYPATH ${SEARCHPATHLIST} )
+ SET(MY_PATH_INCLUDE ${MY_PATH_INCLUDE} ${MYPATH}/include)
+ SET(MY_PATH_LIB ${MY_PATH_LIB} ${MYPATH}/lib)
+ ENDFOREACH( MYPATH ${SEARCHPATHLIST} )
+
+ FIND_PATH("${DEPNAME}_INCLUDE_DIR" ${INCLUDEFILE}
+ ${MY_PATH_INCLUDE}
+ )
+ MARK_AS_ADVANCED("${DEPNAME}_INCLUDE_DIR")
+ #MESSAGE( " ${DEPNAME}_INCLUDE_DIR --> ${${DEPNAME}_INCLUDE_DIR}<--")
+
+ FIND_LIBRARY("${DEPNAME}_LIBRARY"
+ NAMES ${LIBRARY_NAMES}
+ PATHS ${MY_PATH_LIB}
+ )
+ SET(LIBRARY_NAMES_DEBUG "")
+ FOREACH(LIBNAME ${LIBRARY_NAMES})
+ LIST(APPEND LIBRARY_NAMES_DEBUG "${LIBNAME}${DEBUGSUFFIX}")
+ ENDFOREACH(LIBNAME)
+ FIND_LIBRARY("${DEPNAME}_LIBRARY_DEBUG"
+ NAMES ${LIBRARY_NAMES_DEBUG}
+ PATHS ${MY_PATH_LIB}
+ )
+ MARK_AS_ADVANCED("${DEPNAME}_LIBRARY")
+ #MESSAGE( " ${DEPNAME}_LIBRARY --> ${${DEPNAME}_LIBRARY}<--")
+ SET( ${DEPNAME}_FOUND "NO" )
+ IF(${DEPNAME}_INCLUDE_DIR AND ${DEPNAME}_LIBRARY)
+ SET( ${DEPNAME}_FOUND "YES" )
+ IF(NOT ${DEPNAME}_LIBRARY_DEBUG)
+ MESSAGE("-- Warning Debug ${DEPNAME} not found, using: ${${DEPNAME}_LIBRARY}")
+ SET(${DEPNAME}_LIBRARY_DEBUG "${${DEPNAME}_LIBRARY}")
+ ENDIF(NOT ${DEPNAME}_LIBRARY_DEBUG)
+ ENDIF(${DEPNAME}_INCLUDE_DIR AND ${DEPNAME}_LIBRARY)
ENDMACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES SEARCHPATHLIST DEBUGSUFFIX)
@@ -51,32 +51,32 @@ ENDMACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES SEARCHPATHLIST DEBUGS
################################################################################################
MACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN)
- FIND_DEPENDENCY(TIFF tiff.h libtiff ${OSG_3RDPARTY_BIN} "D")
- FIND_DEPENDENCY(FREETYPE freetype "freetype;freetype219" ${OSG_3RDPARTY_BIN} "_D")
- IF(FREETYPE_FOUND)
- #forcing subsequent FindFreeType stuff to not search for other variables.... kind of a hack
- SET(FREETYPE_INCLUDE_DIR_ft2build ${FREETYPE_INCLUDE_DIR} CACHE PATH "")
- SET(FREETYPE_INCLUDE_DIR_freetype2 ${FREETYPE_INCLUDE_DIR} CACHE PATH "")
- MARK_AS_ADVANCED(FREETYPE_INCLUDE_DIR_ft2build FREETYPE_INCLUDE_DIR_freetype2)
- ENDIF(FREETYPE_FOUND)
- FIND_DEPENDENCY(JPEG jpeglib.h libjpeg ${OSG_3RDPARTY_BIN} "D")
- #FIND_DEPENDENCY(GDAL gdal.h "gdal;gdal_i" ${OSG_3RDPARTY_BIN})
- FIND_DEPENDENCY(GLUT GL/glut.h glut32 ${OSG_3RDPARTY_BIN} "D")
- IF(GLUT_FOUND)
- #forcing subsequent FindGlut stuff to not search for other variables.... kind of a hack
- SET(GLUT_glut_LIBRARY ${GLUT_LIBRARY} CACHE FILEPATH "")
- MARK_AS_ADVANCED(GLUT_glut_LIBRARY)
- ENDIF(GLUT_FOUND)
- FIND_DEPENDENCY(GIFLIB gif_lib.h "ungif;libungif" ${OSG_3RDPARTY_BIN} "D")
- FIND_DEPENDENCY(ZLIB zlib.h "z;zlib" ${OSG_3RDPARTY_BIN} "D")
- IF(ZLIB_FOUND)
- FIND_DEPENDENCY(PNG png.h libpng ${OSG_3RDPARTY_BIN} "D")
- IF(PNG_FOUND)
- #forcing subsequent FindPNG stuff to not 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)
+ FIND_DEPENDENCY(TIFF tiff.h libtiff ${OSG_3RDPARTY_BIN} "D")
+ FIND_DEPENDENCY(FREETYPE freetype "freetype;freetype219" ${OSG_3RDPARTY_BIN} "_D")
+ IF(FREETYPE_FOUND)
+ #forcing subsequent FindFreeType stuff to not search for other variables.... kind of a hack
+ SET(FREETYPE_INCLUDE_DIR_ft2build ${FREETYPE_INCLUDE_DIR} CACHE PATH "")
+ SET(FREETYPE_INCLUDE_DIR_freetype2 ${FREETYPE_INCLUDE_DIR} CACHE PATH "")
+ MARK_AS_ADVANCED(FREETYPE_INCLUDE_DIR_ft2build FREETYPE_INCLUDE_DIR_freetype2)
+ ENDIF(FREETYPE_FOUND)
+ FIND_DEPENDENCY(JPEG jpeglib.h libjpeg ${OSG_3RDPARTY_BIN} "D")
+ #FIND_DEPENDENCY(GDAL gdal.h "gdal;gdal_i" ${OSG_3RDPARTY_BIN})
+ FIND_DEPENDENCY(GLUT GL/glut.h glut32 ${OSG_3RDPARTY_BIN} "D")
+ IF(GLUT_FOUND)
+ #forcing subsequent FindGlut stuff to not search for other variables.... kind of a hack
+ SET(GLUT_glut_LIBRARY ${GLUT_LIBRARY} CACHE FILEPATH "")
+ MARK_AS_ADVANCED(GLUT_glut_LIBRARY)
+ ENDIF(GLUT_FOUND)
+ FIND_DEPENDENCY(GIFLIB gif_lib.h "ungif;libungif" ${OSG_3RDPARTY_BIN} "D")
+ FIND_DEPENDENCY(ZLIB zlib.h "z;zlib" ${OSG_3RDPARTY_BIN} "D")
+ IF(ZLIB_FOUND)
+ FIND_DEPENDENCY(PNG png.h libpng ${OSG_3RDPARTY_BIN} "D")
+ IF(PNG_FOUND)
+ #forcing subsequent FindPNG stuff to not 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)
#luigi#INCLUDE(FindOSGDepends.cmake)
ENDMACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN)
@@ -89,9 +89,9 @@ ENDMACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN)
OPTION(USE_3DPARTY_BIN "Set to ON to use Mike prebuilt dependencies situated side of OpenSceneGraph source. Use OFF for avoiding." ON)
IF(USE_3DPARTY_BIN)
- GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_SOURCE_DIR} PATH)
- SET(ACTUAL_3DPARTY_DIR "${PARENT_DIR}/3rdparty" CACHE PATH "Location of 3rdparty dependencies")
- IF(EXISTS ${ACTUAL_3DPARTY_DIR})
- SEARCH_3RDPARTY(${ACTUAL_3DPARTY_DIR})
- ENDIF(EXISTS ${ACTUAL_3DPARTY_DIR})
+ GET_FILENAME_COMPONENT(PARENT_DIR ${PROJECT_SOURCE_DIR} PATH)
+ SET(ACTUAL_3DPARTY_DIR "${PARENT_DIR}/3rdparty" CACHE PATH "Location of 3rdparty dependencies")
+ IF(EXISTS ${ACTUAL_3DPARTY_DIR})
+ SEARCH_3RDPARTY(${ACTUAL_3DPARTY_DIR})
+ ENDIF(EXISTS ${ACTUAL_3DPARTY_DIR})
ENDIF(USE_3DPARTY_BIN)
@@ -25,55 +25,55 @@
# I'm going to attempt to cut out the middleman and hope
# everything still works.
FIND_PATH(FREETYPE_INCLUDE_DIR_ft2build ft2build.h
- $ENV{FREETYPE_DIR}
- /usr/local/include
- /usr/include
- /usr/local/X11R6
- /usr/X11R6/include
- /sw/include
- /opt/local/include
- /opt/csw/include
- /opt/include
- /usr/freeware/include/freetype2
+ $ENV{FREETYPE_DIR}
+ /usr/local/include
+ /usr/include
+ /usr/local/X11R6
+ /usr/X11R6/include
+ /sw/include
+ /opt/local/include
+ /opt/csw/include
+ /opt/include
+ /usr/freeware/include/freetype2
)
FIND_PATH(FREETYPE_INCLUDE_DIR_freetype2 freetype/config/ftheader.h
- $ENV{FREETYPE_DIR}/include/freetype2
- /usr/local/include/freetype2
- /usr/include/freetype2
- /usr/local/X11R6/include/freetype2
- /usr/X11R6/include/freetype2
- /sw/include/freetype2
- /opt/local/include/freetype2
- /opt/csw/include/freetype2
- /opt/include/freetype2
- /usr/freeware/include/freetype2
+ $ENV{FREETYPE_DIR}/include/freetype2
+ /usr/local/include/freetype2
+ /usr/include/freetype2
+ /usr/local/X11R6/include/freetype2
+ /usr/X11R6/include/freetype2
+ /sw/include/freetype2
+ /opt/local/include/freetype2
+ /opt/csw/include/freetype2
+ /opt/include/freetype2
+ /usr/freeware/include/freetype2
)
FIND_LIBRARY(FREETYPE_LIBRARY
- NAMES freetype libfreetype freetype219
- PATHS
- $ENV{FREETYPE_DIR}/lib
- $ENV{FREETYPE_DIR}/lib
- /usr/local/lib
- /usr/lib
- /usr/local/X11R6/lib
- /usr/X11R6/lib
- /sw/lib
- /opt/local/lib
- /opt/csw/lib
- /opt/lib
- /usr/freeware/lib64
+ NAMES freetype libfreetype freetype219
+ PATHS
+ $ENV{FREETYPE_DIR}/lib
+ $ENV{FREETYPE_DIR}/lib
+ /usr/local/lib
+ /usr/lib
+ /usr/local/X11R6/lib
+ /usr/X11R6/lib
+ /sw/lib
+ /opt/local/lib
+ /opt/csw/lib
+ /opt/lib
+ /usr/freeware/lib64
)
IF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
- SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
+ SET(FREETYPE_INCLUDE_DIRS "${FREETYPE_INCLUDE_DIR_ft2build};${FREETYPE_INCLUDE_DIR_freetype2}")
ENDIF(FREETYPE_INCLUDE_DIR_ft2build AND FREETYPE_INCLUDE_DIR_freetype2)
SET(FREETYPE_FOUND "NO")
IF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS)
- SET(FREETYPE_FOUND "YES")
+ SET(FREETYPE_FOUND "YES")
ENDIF(FREETYPE_LIBRARY AND FREETYPE_INCLUDE_DIRS)
@@ -11,46 +11,46 @@
# Created by Eric Wing.
FIND_PATH(GIFLIB_INCLUDE_DIR gif_lib.h
- $ENV{GIFLIB_DIR}/include
- $ENV{GIFLIB_DIR}
- $ENV{OSGDIR}/include
- $ENV{OSGDIR}
- $ENV{OSG_ROOT}/include
- ~/Library/Frameworks
- /Library/Frameworks
- /usr/local/include
- /usr/include
- /sw/include # Fink
- /opt/local/include # DarwinPorts
- /opt/csw/include # Blastwave
- /opt/include
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
- /usr/freeware/include
+ $ENV{GIFLIB_DIR}/include
+ $ENV{GIFLIB_DIR}
+ $ENV{OSGDIR}/include
+ $ENV{OSGDIR}
+ $ENV{OSG_ROOT}/include
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /usr/local/include
+ /usr/include
+ /sw/include # Fink
+ /opt/local/include # DarwinPorts
+ /opt/csw/include # Blastwave
+ /opt/include
+ [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/include
+ /usr/freeware/include
)
FIND_LIBRARY(GIFLIB_LIBRARY
- NAMES gif ungif libgif libungif
- PATHS
- $ENV{GIFLIB_DIR}/lib
- $ENV{GIFLIB_DIR}
- $ENV{OSGDIR}/lib
- $ENV{OSGDIR}
- $ENV{OSG_ROOT}/lib
- ~/Library/Frameworks
- /Library/Frameworks
- /usr/local/lib
- /usr/lib
- /sw/lib
- /opt/local/lib
- /opt/csw/lib
- /opt/lib
- [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
- /usr/freeware/lib64
+ NAMES gif ungif libgif libungif
+ PATHS
+ $ENV{GIFLIB_DIR}/lib
+ $ENV{GIFLIB_DIR}
+ $ENV{OSGDIR}/lib
+ $ENV{OSGDIR}
+ $ENV{OSG_ROOT}/lib
+ ~/Library/Frameworks
+ /Library/Frameworks
+ /usr/local/lib
+ /usr/lib
+ /sw/lib
+ /opt/local/lib
+ /opt/csw/lib
+ /opt/lib
+ [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib
+ /usr/freeware/lib64
)
SET(GIFLIB_FOUND "NO")
IF(GIFLIB_LIBRARY AND GIFLIB_INCLUDE_DIR)
- SET(GIFLIB_FOUND "YES")
+ SET(GIFLIB_FOUND "YES")
ENDIF(GIFLIB_LIBRARY AND GIFLIB_INCLUDE_DIR)
@@ -5,12 +5,12 @@
# INVENTOR_INCLUDE_DIR, where to find headers.
FIND_PATH(INVENTOR_INCLUDE_DIR Inventor/So.h
- /usr/local/include
- /usr/include
- /sw/include
- /opt/local/include
- /opt/csw/include
- /opt/include
+ /usr/local/include
+ /usr/include
+ /sw/include
+ /opt/local/include
+ /opt/csw/include
+ /opt/include
)
FIND_LIBRARY(INVENTOR_LIBRARY
@@ -39,5 +39,5 @@ ENDIF(NOT INVENTOR_LIBRARY)
SET(INVENTOR_FOUND "NO")
IF(INVENTOR_INCLUDE_DIR AND INVENTOR_LIBRARY)
- SET(INVENTOR_FOUND "YES")
+ SET(INVENTOR_FOUND "YES")
ENDIF(INVENTOR_INCLUDE_DIR AND INVENTOR_LIBRARY)
Oops, something went wrong.

0 comments on commit 9cdf1b2

Please sign in to comment.