diff --git a/CMakeModules/Find3rdPartyDependencies.cmake b/CMakeModules/Find3rdPartyDependencies.cmake index 510c2ebc6..cfc3d1074 100644 --- a/CMakeModules/Find3rdPartyDependencies.cmake +++ b/CMakeModules/Find3rdPartyDependencies.cmake @@ -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) diff --git a/CMakeModules/FindFreeType.cmake b/CMakeModules/FindFreeType.cmake index e88fc09f9..8ba8f0816 100644 --- a/CMakeModules/FindFreeType.cmake +++ b/CMakeModules/FindFreeType.cmake @@ -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) diff --git a/CMakeModules/FindGIFLIB.cmake b/CMakeModules/FindGIFLIB.cmake index 481d69248..250caadbd 100644 --- a/CMakeModules/FindGIFLIB.cmake +++ b/CMakeModules/FindGIFLIB.cmake @@ -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) diff --git a/CMakeModules/FindInventor.cmake b/CMakeModules/FindInventor.cmake index 57b71d4c9..07dabbcaa 100644 --- a/CMakeModules/FindInventor.cmake +++ b/CMakeModules/FindInventor.cmake @@ -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) diff --git a/CMakeModules/FindOpenThreads.cmake b/CMakeModules/FindOpenThreads.cmake index 0d9cf035b..6e0af40f5 100644 --- a/CMakeModules/FindOpenThreads.cmake +++ b/CMakeModules/FindOpenThreads.cmake @@ -39,115 +39,115 @@ # Explicit -DVAR=value arguments should still be able to override everything. FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread - $ENV{OPENTHREADS_INCLUDE_DIR} - $ENV{OPENTHREADS_DIR}/include - $ENV{OPENTHREADS_DIR} - $ENV{OSG_INCLUDE_DIR} - $ENV{OSG_DIR}/include - $ENV{OSG_DIR} - NO_DEFAULT_PATH + $ENV{OPENTHREADS_INCLUDE_DIR} + $ENV{OPENTHREADS_DIR}/include + $ENV{OPENTHREADS_DIR} + $ENV{OSG_INCLUDE_DIR} + $ENV{OSG_DIR}/include + $ENV{OSG_DIR} + NO_DEFAULT_PATH ) IF(NOT OPENTHREADS_INCLUDE_DIR) - FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread - ~/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 - ${CMAKE_INSTALL_PREFIX}/include # hack: this should be last because it can interfere badly with other search paths in the case where you do not explicitly set this value and CMake invokes its default value which may not be what you want. - ) + FIND_PATH(OPENTHREADS_INCLUDE_DIR OpenThreads/Thread + ~/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 + ${CMAKE_INSTALL_PREFIX}/include # hack: this should be last because it can interfere badly with other search paths in the case where you do not explicitly set this value and CMake invokes its default value which may not be what you want. + ) ENDIF(NOT OPENTHREADS_INCLUDE_DIR) FIND_LIBRARY(OPENTHREADS_LIBRARY - NAMES OpenThreads OpenThreadsWin32 - PATHS - $ENV{OPENTHREADS_LIBRARY_DIR} - $ENV{OPENTHREADS_DIR}/lib64 - $ENV{OPENTHREADS_DIR}/lib - $ENV{OPENTHREADS_DIR} - $ENV{OSG_LIBRARY_DIR} - $ENV{OSG_DIR}/lib64 - $ENV{OSG_DIR}/lib - $ENV{OSG_DIR} - NO_DEFAULT_PATH + NAMES OpenThreads OpenThreadsWin32 + PATHS + $ENV{OPENTHREADS_LIBRARY_DIR} + $ENV{OPENTHREADS_DIR}/lib64 + $ENV{OPENTHREADS_DIR}/lib + $ENV{OPENTHREADS_DIR} + $ENV{OSG_LIBRARY_DIR} + $ENV{OSG_DIR}/lib64 + $ENV{OSG_DIR}/lib + $ENV{OSG_DIR} + NO_DEFAULT_PATH ) IF(NOT OPENTHREADS_LIBRARY) - FIND_LIBRARY(OPENTHREADS_LIBRARY - NAMES OpenThreads OpenThreadsWin32 - PATHS - ~/Library/Frameworks - /Library/Frameworks - /usr/local/lib64 - /usr/local/lib - /usr/lib64 - /usr/lib - /sw/lib64 - /sw/lib - /opt/local/lib64 - /opt/local/lib - /opt/csw/lib64 - /opt/csw/lib - /opt/lib64 - /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib - ${CMAKE_INSTALL_PREFIX}/lib64 # hack: this should be last because it can interfere badly with other search paths in the case where you do not explicitly set this value and CMake invokes its default value which may not be what you want. - ${CMAKE_INSTALL_PREFIX}/lib # hack - ) + FIND_LIBRARY(OPENTHREADS_LIBRARY + NAMES OpenThreads OpenThreadsWin32 + PATHS + ~/Library/Frameworks + /Library/Frameworks + /usr/local/lib64 + /usr/local/lib + /usr/lib64 + /usr/lib + /sw/lib64 + /sw/lib + /opt/local/lib64 + /opt/local/lib + /opt/csw/lib64 + /opt/csw/lib + /opt/lib64 + /opt/lib + [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib + ${CMAKE_INSTALL_PREFIX}/lib64 # hack: this should be last because it can interfere badly with other search paths in the case where you do not explicitly set this value and CMake invokes its default value which may not be what you want. + ${CMAKE_INSTALL_PREFIX}/lib # hack + ) ENDIF(NOT OPENTHREADS_LIBRARY) FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG - NAMES OpenThreadsd OpenThreadsWin32d - PATHS - $ENV{OPENTHREADS_LIBRARY_DIR} - $ENV{OPENTHREADS_DIR}/lib64 - $ENV{OPENTHREADS_DIR}/lib - $ENV{OPENTHREADS_DIR} - $ENV{OSG_LIBRARY_DIR} - $ENV{OSG_DIR}/lib64 - $ENV{OSG_DIR}/lib - $ENV{OSG_DIR} - NO_DEFAULT_PATH + NAMES OpenThreadsd OpenThreadsWin32d + PATHS + $ENV{OPENTHREADS_LIBRARY_DIR} + $ENV{OPENTHREADS_DIR}/lib64 + $ENV{OPENTHREADS_DIR}/lib + $ENV{OPENTHREADS_DIR} + $ENV{OSG_LIBRARY_DIR} + $ENV{OSG_DIR}/lib64 + $ENV{OSG_DIR}/lib + $ENV{OSG_DIR} + NO_DEFAULT_PATH ) IF(NOT OPENTHREADS_LIBRARY_DEBUG) - FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG - NAMES OpenThreadsd OpenThreadsWin32d - PATHS - /usr/local/lib64 - /usr/local/lib - /usr/lib64 - /usr/lib - /sw/lib64 - /sw/lib - /opt/local/lib64 - /opt/local/lib - /opt/csw/lib64 - /opt/csw/lib - /opt/lib64 - /opt/lib - [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib - ${CMAKE_INSTALL_PREFIX}/lib64 # hack: this should be last because it can interfere badly with other search paths in the case where you do not explicitly set this value and CMake invokes its default value which may not be what you want. - ${CMAKE_INSTALL_PREFIX}/lib # hack - ) + FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG + NAMES OpenThreadsd OpenThreadsWin32d + PATHS + /usr/local/lib64 + /usr/local/lib + /usr/lib64 + /usr/lib + /sw/lib64 + /sw/lib + /opt/local/lib64 + /opt/local/lib + /opt/csw/lib64 + /opt/csw/lib + /opt/lib64 + /opt/lib + [HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session\ Manager\\Environment;OSG_ROOT]/lib + ${CMAKE_INSTALL_PREFIX}/lib64 # hack: this should be last because it can interfere badly with other search paths in the case where you do not explicitly set this value and CMake invokes its default value which may not be what you want. + ${CMAKE_INSTALL_PREFIX}/lib # hack + ) ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG) IF(OPENTHREADS_LIBRARY) IF(NOT OPENTHREADS_LIBRARY_DEBUG) - #MESSAGE("-- Warning Debug OpenThreads not found, using: ${OPENTHREADS_LIBRARY}") - #SET(OPENTHREADS_LIBRARY_DEBUG "${OPENTHREADS_LIBRARY}") - SET(OPENTHREADS_LIBRARY_DEBUG "${OPENTHREADS_LIBRARY}" CACHE FILEPATH "Debug version of OpenThreads Library (use regular version if not available)" FORCE) + #MESSAGE("-- Warning Debug OpenThreads not found, using: ${OPENTHREADS_LIBRARY}") + #SET(OPENTHREADS_LIBRARY_DEBUG "${OPENTHREADS_LIBRARY}") + SET(OPENTHREADS_LIBRARY_DEBUG "${OPENTHREADS_LIBRARY}" CACHE FILEPATH "Debug version of OpenThreads Library (use regular version if not available)" FORCE) ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG) ENDIF(OPENTHREADS_LIBRARY) - + SET(OPENTHREADS_FOUND "NO") IF(OPENTHREADS_INCLUDE_DIR AND OPENTHREADS_LIBRARY) SET(OPENTHREADS_FOUND "YES") diff --git a/CMakeModules/FindQuickTime.cmake b/CMakeModules/FindQuickTime.cmake index 357f1f4bc..6fc1af57f 100644 --- a/CMakeModules/FindQuickTime.cmake +++ b/CMakeModules/FindQuickTime.cmake @@ -14,19 +14,19 @@ # so I am going to case the two. IF(APPLE) - FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h) - FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime) + FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime/QuickTime.h) + FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime) ELSE(APPLE) - FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h - $ENV{QUICKTIME_DIR}/include - $ENV{QUICKTIME_DIR} - ) - FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime) + FIND_PATH(QUICKTIME_INCLUDE_DIR QuickTime.h + $ENV{QUICKTIME_DIR}/include + $ENV{QUICKTIME_DIR} + ) + FIND_LIBRARY(QUICKTIME_LIBRARY QuickTime) ENDIF(APPLE) SET(QUICKTIME_FOUND "NO") IF(QUICKTIME_LIBRARY AND QUICKTIME_INCLUDE_DIR) - SET(QUICKTIME_FOUND "YES") + SET(QUICKTIME_FOUND "YES") ENDIF(QUICKTIME_LIBRARY AND QUICKTIME_INCLUDE_DIR) diff --git a/CMakeModules/ListHandle.cmake b/CMakeModules/ListHandle.cmake index 14ac33719..bb725addc 100644 --- a/CMakeModules/ListHandle.cmake +++ b/CMakeModules/ListHandle.cmake @@ -65,9 +65,9 @@ MACRO(PARSE_ARGUMENTS prefix arg_names option_names) ELSE (is_arg_name) LIST_CONTAINS(is_option ${arg} ${option_names}) IF (is_option) - SET(${prefix}_${arg} TRUE) + SET(${prefix}_${arg} TRUE) ELSE (is_option) - SET(current_arg_list ${current_arg_list} ${arg}) + SET(current_arg_list ${current_arg_list} ${arg}) ENDIF (is_option) ENDIF (is_arg_name) ENDFOREACH(arg) diff --git a/CMakeModules/ModuleInstall.cmake b/CMakeModules/ModuleInstall.cmake index 944638881..739b65242 100644 --- a/CMakeModules/ModuleInstall.cmake +++ b/CMakeModules/ModuleInstall.cmake @@ -7,29 +7,29 @@ SET(INSTALL_INCDIR include) SET(INSTALL_BINDIR bin) IF(WIN32) - SET(INSTALL_LIBDIR bin) - SET(INSTALL_ARCHIVEDIR lib) + SET(INSTALL_LIBDIR bin) + SET(INSTALL_ARCHIVEDIR lib) ELSE(WIN32) - SET(INSTALL_LIBDIR lib${LIB_POSTFIX}) - SET(INSTALL_ARCHIVEDIR lib${LIB_POSTFIX}) + SET(INSTALL_LIBDIR lib${LIB_POSTFIX}) + SET(INSTALL_ARCHIVEDIR lib${LIB_POSTFIX}) ENDIF(WIN32) SET(HEADERS_GROUP "Header Files") SOURCE_GROUP( - ${HEADERS_GROUP} - FILES ${LIB_PUBLIC_HEADERS} + ${HEADERS_GROUP} + FILES ${LIB_PUBLIC_HEADERS} ) INSTALL( - TARGETS ${LIB_NAME} - RUNTIME DESTINATION ${INSTALL_BINDIR} - LIBRARY DESTINATION ${INSTALL_LIBDIR} - ARCHIVE DESTINATION ${INSTALL_ARCHIVEDIR} + TARGETS ${LIB_NAME} + RUNTIME DESTINATION ${INSTALL_BINDIR} + LIBRARY DESTINATION ${INSTALL_LIBDIR} + ARCHIVE DESTINATION ${INSTALL_ARCHIVEDIR} ) # FIXME: Do not run for OS X framework INSTALL( - FILES ${LIB_PUBLIC_HEADERS} - DESTINATION ${INSTALL_INCDIR}/${LIB_NAME} + FILES ${LIB_PUBLIC_HEADERS} + DESTINATION ${INSTALL_INCDIR}/${LIB_NAME} ) diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake index e02ec1c04..704cdcdb3 100644 --- a/CMakeModules/OsgMacroUtils.cmake +++ b/CMakeModules/OsgMacroUtils.cmake @@ -11,25 +11,25 @@ MACRO(LINK_WITH_VARIABLES TRGTNAME) - FOREACH(varname ${ARGN}) - IF(${varname}_DEBUG) - TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${${varname}}" debug "${${varname}_DEBUG}") - ELSE(${varname}_DEBUG) - TARGET_LINK_LIBRARIES(${TRGTNAME} "${${varname}}" ) - ENDIF(${varname}_DEBUG) - ENDFOREACH(varname) + FOREACH(varname ${ARGN}) + IF(${varname}_DEBUG) + TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${${varname}}" debug "${${varname}_DEBUG}") + ELSE(${varname}_DEBUG) + TARGET_LINK_LIBRARIES(${TRGTNAME} "${${varname}}" ) + ENDIF(${varname}_DEBUG) + ENDFOREACH(varname) ENDMACRO(LINK_WITH_VARIABLES TRGTNAME) MACRO(LINK_INTERNAL TRGTNAME) - FOREACH(LINKLIB ${ARGN}) - TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${LINKLIB}" debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}") - ENDFOREACH(LINKLIB) + FOREACH(LINKLIB ${ARGN}) + TARGET_LINK_LIBRARIES(${TRGTNAME} optimized "${LINKLIB}" debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}") + ENDFOREACH(LINKLIB) ENDMACRO(LINK_INTERNAL TRGTNAME) MACRO(LINK_EXTERNAL TRGTNAME) - FOREACH(LINKLIB ${ARGN}) - TARGET_LINK_LIBRARIES(${TRGTNAME} "${LINKLIB}" ) - ENDFOREACH(LINKLIB) + FOREACH(LINKLIB ${ARGN}) + TARGET_LINK_LIBRARIES(${TRGTNAME} "${LINKLIB}" ) + ENDFOREACH(LINKLIB) ENDMACRO(LINK_EXTERNAL TRGTNAME) @@ -40,8 +40,8 @@ ENDMACRO(LINK_EXTERNAL TRGTNAME) ####################################################################################################### MACRO(LINK_CORELIB_DEFAULT CORELIB_NAME) - LINK_EXTERNAL(${CORELIB_NAME} ${OPENGL_LIBRARIES}) - LINK_WITH_VARIABLES(${CORELIB_NAME} OPENTHREADS_LIBRARY) + LINK_EXTERNAL(${CORELIB_NAME} ${OPENGL_LIBRARIES}) + LINK_WITH_VARIABLES(${CORELIB_NAME} OPENTHREADS_LIBRARY) ENDMACRO(LINK_CORELIB_DEFAULT CORELIB_NAME) @@ -70,27 +70,27 @@ MACRO(SETUP_LINK_LIBRARIES) SET(TARGET_LIBRARIES ${TARGET_COMMON_LIBRARIES}) FOREACH(LINKLIB ${TARGET_ADDED_LIBRARIES}) - SET(TO_INSERT TRUE) - FOREACH (value ${TARGET_COMMON_LIBRARIES}) - IF (${value} STREQUAL ${LINKLIB}) - SET(TO_INSERT FALSE) - ENDIF (${value} STREQUAL ${LINKLIB}) + SET(TO_INSERT TRUE) + FOREACH (value ${TARGET_COMMON_LIBRARIES}) + IF (${value} STREQUAL ${LINKLIB}) + SET(TO_INSERT FALSE) + ENDIF (${value} STREQUAL ${LINKLIB}) ENDFOREACH (value ${TARGET_COMMON_LIBRARIES}) - IF(TO_INSERT) - LIST(APPEND TARGET_LIBRARIES ${LINKLIB}) - ENDIF(TO_INSERT) + IF(TO_INSERT) + LIST(APPEND TARGET_LIBRARIES ${LINKLIB}) + ENDIF(TO_INSERT) ENDFOREACH(LINKLIB) FOREACH(LINKLIB ${TARGET_LIBRARIES}) - TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}") + TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} optimized ${LINKLIB} debug "${LINKLIB}${CMAKE_DEBUG_POSTFIX}") ENDFOREACH(LINKLIB) FOREACH(LINKLIB ${TARGET_EXTERNAL_LIBRARIES}) - TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${LINKLIB}) + TARGET_LINK_LIBRARIES(${TARGET_TARGETNAME} ${LINKLIB}) ENDFOREACH(LINKLIB) - IF(TARGET_LIBRARIES_VARS) - LINK_WITH_VARIABLES(${TARGET_TARGETNAME} ${TARGET_LIBRARIES_VARS}) - ENDIF(TARGET_LIBRARIES_VARS) + IF(TARGET_LIBRARIES_VARS) + LINK_WITH_VARIABLES(${TARGET_TARGETNAME} ${TARGET_LIBRARIES_VARS}) + ENDIF(TARGET_LIBRARIES_VARS) ENDMACRO(SETUP_LINK_LIBRARIES) ############################################################################################ @@ -101,35 +101,35 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME) SET(TARGET_NAME ${PLUGIN_NAME} ) - #MESSAGE("in -->SETUP_PLUGIN<-- ${TARGET_NAME}-->${TARGET_SRC} <--> ${TARGET_H}<--") + #MESSAGE("in -->SETUP_PLUGIN<-- ${TARGET_NAME}-->${TARGET_SRC} <--> ${TARGET_H}<--") - ## we have set up the target label and targetname by taking into account global prfix (osgdb_) + ## we have set up the target label and targetname by taking into account global prfix (osgdb_) - IF(NOT TARGET_TARGETNAME) - SET(TARGET_TARGETNAME "${TARGET_DEFAULT_PREFIX}${TARGET_NAME}") - ENDIF(NOT TARGET_TARGETNAME) - IF(NOT TARGET_LABEL) - SET(TARGET_LABEL "${TARGET_DEFAULT_LABEL_PREFIX} ${TARGET_NAME}") - ENDIF(NOT TARGET_LABEL) - -# here we use the command to generate the library - - ADD_LIBRARY(${TARGET_TARGETNAME} MODULE ${TARGET_SRC} ${TARGET_H}) - - #not sure if needed, but for plugins only msvc need the d suffix - IF(NOT MSVC) - SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "") - ENDIF(NOT MSVC) - SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}") + IF(NOT TARGET_TARGETNAME) + SET(TARGET_TARGETNAME "${TARGET_DEFAULT_PREFIX}${TARGET_NAME}") + ENDIF(NOT TARGET_TARGETNAME) + IF(NOT TARGET_LABEL) + SET(TARGET_LABEL "${TARGET_DEFAULT_LABEL_PREFIX} ${TARGET_NAME}") + ENDIF(NOT TARGET_LABEL) + +# here we use the command to generate the library + + ADD_LIBRARY(${TARGET_TARGETNAME} MODULE ${TARGET_SRC} ${TARGET_H}) + + #not sure if needed, but for plugins only msvc need the d suffix + IF(NOT MSVC) + SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX "") + ENDIF(NOT MSVC) + SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}") - SETUP_LINK_LIBRARIES() + SETUP_LINK_LIBRARIES() #the installation path are differentiated for win32 that install in bib versus other architecture that install in lib${LIB_POSTFIX}/osgPlugins - IF(WIN32) - INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION bin ) - ELSE(WIN32) - INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/osgPlugins LIBRARY DESTINATION lib${LIB_POSTFIX}/osgPlugins ) - ENDIF(WIN32) + IF(WIN32) + INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib LIBRARY DESTINATION bin ) + ELSE(WIN32) + INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ARCHIVE DESTINATION lib${LIB_POSTFIX}/osgPlugins LIBRARY DESTINATION lib${LIB_POSTFIX}/osgPlugins ) + ENDIF(WIN32) ENDMACRO(SETUP_PLUGIN) @@ -138,24 +138,24 @@ ENDMACRO(SETUP_PLUGIN) ########################################################### MACRO(SETUP_EXE IS_COMMANDLINE_APP) - #MESSAGE("in -->SETUP_EXE<-- ${TARGET_NAME}-->${TARGET_SRC} <--> ${TARGET_H}<--") - IF(NOT TARGET_TARGETNAME) - SET(TARGET_TARGETNAME "${TARGET_DEFAULT_PREFIX}${TARGET_NAME}") - ENDIF(NOT TARGET_TARGETNAME) - IF(NOT TARGET_LABEL) - SET(TARGET_LABEL "${TARGET_DEFAULT_LABEL_PREFIX} ${TARGET_NAME}") - ENDIF(NOT TARGET_LABEL) + #MESSAGE("in -->SETUP_EXE<-- ${TARGET_NAME}-->${TARGET_SRC} <--> ${TARGET_H}<--") + IF(NOT TARGET_TARGETNAME) + SET(TARGET_TARGETNAME "${TARGET_DEFAULT_PREFIX}${TARGET_NAME}") + ENDIF(NOT TARGET_TARGETNAME) + IF(NOT TARGET_LABEL) + SET(TARGET_LABEL "${TARGET_DEFAULT_LABEL_PREFIX} ${TARGET_NAME}") + ENDIF(NOT TARGET_LABEL) - IF(${IS_COMMANDLINE_APP}) - ADD_EXECUTABLE(${TARGET_TARGETNAME} ${TARGET_SRC} ${TARGET_H}) - ELSE(${IS_COMMANDLINE_APP}) - ADD_EXECUTABLE(${TARGET_TARGETNAME} MACOSX_BUNDLE ${TARGET_SRC} ${TARGET_H}) - ENDIF(${IS_COMMANDLINE_APP}) - SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}") - SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) - SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME}) - - SETUP_LINK_LIBRARIES() + IF(${IS_COMMANDLINE_APP}) + ADD_EXECUTABLE(${TARGET_TARGETNAME} ${TARGET_SRC} ${TARGET_H}) + ELSE(${IS_COMMANDLINE_APP}) + ADD_EXECUTABLE(${TARGET_TARGETNAME} MACOSX_BUNDLE ${TARGET_SRC} ${TARGET_H}) + ENDIF(${IS_COMMANDLINE_APP}) + SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES PROJECT_LABEL "${TARGET_LABEL}") + SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) + SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES OUTPUT_NAME ${TARGET_NAME}) + + SETUP_LINK_LIBRARIES() ENDMACRO(SETUP_EXE) @@ -164,15 +164,15 @@ MACRO(SETUP_APPLICATION APPLICATION_NAME) SET(TARGET_NAME ${APPLICATION_NAME} ) - IF(${ARGC} GREATER 1) - SET(IS_COMMANDLINE_APP ${ARGV1}) - ELSE(${ARGC} GREATER 1) - SET(IS_COMMANDLINE_APP 0) - ENDIF(${ARGC} GREATER 1) - + IF(${ARGC} GREATER 1) + SET(IS_COMMANDLINE_APP ${ARGV1}) + ELSE(${ARGC} GREATER 1) + SET(IS_COMMANDLINE_APP 0) + ENDIF(${ARGC} GREATER 1) + SETUP_EXE(${IS_COMMANDLINE_APP}) - INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ) + INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin ) ENDMACRO(SETUP_APPLICATION) @@ -187,15 +187,15 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME) SET(TARGET_NAME ${EXAMPLE_NAME} ) - IF(${ARGC} GREATER 1) - SET(IS_COMMANDLINE_APP ${ARGV1}) - ELSE(${ARGC} GREATER 1) - SET(IS_COMMANDLINE_APP 0) - ENDIF(${ARGC} GREATER 1) - + IF(${ARGC} GREATER 1) + SET(IS_COMMANDLINE_APP ${ARGV1}) + ELSE(${ARGC} GREATER 1) + SET(IS_COMMANDLINE_APP 0) + ENDIF(${ARGC} GREATER 1) + SETUP_EXE(${IS_COMMANDLINE_APP}) - INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin ) + INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin ) ENDMACRO(SETUP_EXAMPLE) diff --git a/CMakeModules/UtilityMacros.cmake b/CMakeModules/UtilityMacros.cmake index 489979ed0..7135731e4 100644 --- a/CMakeModules/UtilityMacros.cmake +++ b/CMakeModules/UtilityMacros.cmake @@ -39,27 +39,27 @@ INCLUDE(ListHandle) MACRO(GET_HEADERS_EXTENSIONLESS DIR GLOB_PATTERN OUTPUT) - FILE(GLOB TMP "${DIR}/${GLOB_PATTERN}" ) + FILE(GLOB TMP "${DIR}/${GLOB_PATTERN}" ) #FOREACH(F ${TMP}) - # MESSAGE(STATUS "header-->${F}<--") + # MESSAGE(STATUS "header-->${F}<--") #ENDFOREACH(F ${TMP}) - FILTER_OUT("${DIR}/CVS" "${TMP}" TMP) - FILTER_OUT("${DIR}/cvs" "${TMP}" ${OUTPUT}) - FILTER_OUT("${DIR}/.svn" "${TMP}" ${OUTPUT}) + FILTER_OUT("${DIR}/CVS" "${TMP}" TMP) + FILTER_OUT("${DIR}/cvs" "${TMP}" ${OUTPUT}) + FILTER_OUT("${DIR}/.svn" "${TMP}" ${OUTPUT}) ENDMACRO(GET_HEADERS_EXTENSIONLESS DIR GLOB_PATTERN OUTPUT) MACRO(ADD_DIRS_TO_ENV_VAR _VARNAME ) FOREACH(_ADD_PATH ${ARGN}) - FILE(TO_NATIVE_PATH ${_ADD_PATH} _ADD_NATIVE) - #SET(_CURR_ENV_PATH $ENV{PATH}) - #LIST(SET _CURR_ENV_PATH ${_ADD_PATH}) - #SET(ENV{PATH} ${_CURR_ENV_PATH})${_FILE} - IF(WIN32) - SET(ENV{${_VARNAME}} "$ENV{${_VARNAME}};${_ADD_NATIVE}") - ELSE(WIN32) - SET(ENV{${_VARNAME}} "$ENV{${_VARNAME}}:${_ADD_NATIVE}") - ENDIF(WIN32) - #MESSAGE(" env ${_VARNAME} --->$ENV{${_VARNAME}}<---") + FILE(TO_NATIVE_PATH ${_ADD_PATH} _ADD_NATIVE) + #SET(_CURR_ENV_PATH $ENV{PATH}) + #LIST(SET _CURR_ENV_PATH ${_ADD_PATH}) + #SET(ENV{PATH} ${_CURR_ENV_PATH})${_FILE} + IF(WIN32) + SET(ENV{${_VARNAME}} "$ENV{${_VARNAME}};${_ADD_NATIVE}") + ELSE(WIN32) + SET(ENV{${_VARNAME}} "$ENV{${_VARNAME}}:${_ADD_NATIVE}") + ENDIF(WIN32) + #MESSAGE(" env ${_VARNAME} --->$ENV{${_VARNAME}}<---") ENDFOREACH(_ADD_PATH) ENDMACRO(ADD_DIRS_TO_ENV_VAR _VARNAME ) @@ -70,10 +70,10 @@ ENDMACRO(ADD_DIRS_TO_ENV_VAR _VARNAME ) #--------------------------------------------------- MACRO(CORRECT_PATH VAR PATH) - SET(${VAR} ${PATH}) -IF(WIN32) - STRING(REGEX REPLACE "/" "\\\\" ${VAR} "${PATH}") -ENDIF(WIN32) + SET(${VAR} ${PATH}) +IF(WIN32) + STRING(REGEX REPLACE "/" "\\\\" ${VAR} "${PATH}") +ENDIF(WIN32) ENDMACRO(CORRECT_PATH) MACRO(TARGET_LOCATIONS_SET_FILE FILE) @@ -84,11 +84,11 @@ ENDMACRO(TARGET_LOCATIONS_SET_FILE FILE) MACRO(TARGET_LOCATIONS_ACCUM TARGET_NAME) IF(ACCUM_FILE_TARGETS) IF(EXISTS ${ACCUM_FILE_TARGETS}) - GET_TARGET_PROPERTY(_FILE_LOCATION ${TARGET_NAME} LOCATION) - FILE(APPEND ${ACCUM_FILE_TARGETS} "${_FILE_LOCATION};") - #SET(_TARGETS_LIST ${_TARGETS_LIST} "${_FILE_LOCATION}" CACHE INTERNAL "lista dll") - #MESSAGE("adding target -->${TARGET_NAME}<-- file -->${_FILE_LOCATION}<-- to list -->${_TARGETS_LIST}<--") - #SET(ACCUM_FILE_TARGETS ${ACCUM_FILE_TARGETS} ${_FILE_LOCATION}) + GET_TARGET_PROPERTY(_FILE_LOCATION ${TARGET_NAME} LOCATION) + FILE(APPEND ${ACCUM_FILE_TARGETS} "${_FILE_LOCATION};") + #SET(_TARGETS_LIST ${_TARGETS_LIST} "${_FILE_LOCATION}" CACHE INTERNAL "lista dll") + #MESSAGE("adding target -->${TARGET_NAME}<-- file -->${_FILE_LOCATION}<-- to list -->${_TARGETS_LIST}<--") + #SET(ACCUM_FILE_TARGETS ${ACCUM_FILE_TARGETS} ${_FILE_LOCATION}) ENDIF(EXISTS ${ACCUM_FILE_TARGETS}) ENDIF(ACCUM_FILE_TARGETS) ENDMACRO(TARGET_LOCATIONS_ACCUM TARGET_NAME) @@ -96,7 +96,7 @@ ENDMACRO(TARGET_LOCATIONS_ACCUM TARGET_NAME) MACRO(TARGET_LOCATIONS_GET_LIST _VAR) IF(ACCUM_FILE_TARGETS) IF(EXISTS ${ACCUM_FILE_TARGETS}) - FILE(READ ${ACCUM_FILE_TARGETS} ${_VAR}) + FILE(READ ${ACCUM_FILE_TARGETS} ${_VAR}) ENDIF(EXISTS ${ACCUM_FILE_TARGETS}) ENDIF(ACCUM_FILE_TARGETS) ENDMACRO(TARGET_LOCATIONS_GET_LIST _VAR) @@ -111,9 +111,9 @@ SET(MY_PATH_LIB ) SET(MY_PATH_BIN ) FOREACH( MYPATH ${SEARCHPATHLIST} ) - SET(MY_PATH_INCLUDE ${MY_PATH_INCLUDE} ${MYPATH}/include) - SET(MY_PATH_LIB ${MY_PATH_LIB} ${MYPATH}/lib) - SET(MY_PATH_BIN ${MY_PATH_BIN} ${MYPATH}/bin) + SET(MY_PATH_INCLUDE ${MY_PATH_INCLUDE} ${MYPATH}/include) + SET(MY_PATH_LIB ${MY_PATH_LIB} ${MYPATH}/lib) + SET(MY_PATH_BIN ${MY_PATH_BIN} ${MYPATH}/bin) ENDFOREACH( MYPATH ${SEARCHPATHLIST} ) SET(MYLIBRARY "${LIBRARY}") @@ -122,7 +122,7 @@ SEPARATE_ARGUMENTS(MYLIBRARY) #MESSAGE( " include paths: -->${MY_PATH_INCLUDE}<--") #MESSAGE( " ${DEPNAME}_INCLUDE_DIR --> ${${DEPNAME}_INCLUDE_DIR}<--") - + FIND_PATH("${DEPNAME}_INCLUDE_DIR" ${INCLUDEFILE} ${MY_PATH_INCLUDE} ) @@ -130,35 +130,35 @@ MARK_AS_ADVANCED("${DEPNAME}_INCLUDE_DIR") #MESSAGE( " ${DEPNAME}_INCLUDE_DIR --> ${${DEPNAME}_INCLUDE_DIR}<--") FIND_LIBRARY("${DEPNAME}_LIBRARY" - NAMES ${MYLIBRARY} + NAMES ${MYLIBRARY} PATHS ${MY_PATH_LIB} ) IF(${DEPNAME}_LIBRARY) - GET_FILENAME_COMPONENT(MYLIBNAME ${${DEPNAME}_LIBRARY} NAME_WE) - GET_FILENAME_COMPONENT(MYBINPATH ${${DEPNAME}_LIBRARY} PATH) - GET_FILENAME_COMPONENT(MYBINPATH ${MYBINPATH} PATH) - SET(MYBINPATH "${MYBINPATH}/bin") - IF(EXISTS ${MYBINPATH}) - SET(MYFOUND 0) - FOREACH(MYPATH ${MY_ACCUM_BINARY_DEP}) - IF(MYPATH MATCHES ${MYBINPATH}) - SET(MYFOUND 1) - #MESSAGE("found -->${MYPATH}<-->${MYBINPATH}<--") - ENDIF(MYPATH MATCHES ${MYBINPATH}) - ENDFOREACH(MYPATH ) - IF(MYFOUND EQUAL 0) - SET(MY_ACCUM_BINARY_DEP ${MY_ACCUM_BINARY_DEP} ${MYBINPATH}) - ENDIF(MYFOUND EQUAL 0) - ENDIF(EXISTS ${MYBINPATH}) - #MESSAGE("${DEPNAME}_BINDEP searching -->${MYLIBNAME}${CMAKE_SHARED_MODULE_SUFFIX}<--in-->${MY_PATH_BIN}<--") -# FIND_FILE("${DEPNAME}_BINDEP" -# ${MYLIBNAME}${CMAKE_SHARED_MODULE_SUFFIX} -# PATHS ${MY_PATH_BIN} -# ) -# FIND_LIBRARY("${DEPNAME}_BINDEP" -# NAMES ${MYLIBRARY} -# PATHS ${MY_PATH_BIN} -# ) + GET_FILENAME_COMPONENT(MYLIBNAME ${${DEPNAME}_LIBRARY} NAME_WE) + GET_FILENAME_COMPONENT(MYBINPATH ${${DEPNAME}_LIBRARY} PATH) + GET_FILENAME_COMPONENT(MYBINPATH ${MYBINPATH} PATH) + SET(MYBINPATH "${MYBINPATH}/bin") + IF(EXISTS ${MYBINPATH}) + SET(MYFOUND 0) + FOREACH(MYPATH ${MY_ACCUM_BINARY_DEP}) + IF(MYPATH MATCHES ${MYBINPATH}) + SET(MYFOUND 1) + #MESSAGE("found -->${MYPATH}<-->${MYBINPATH}<--") + ENDIF(MYPATH MATCHES ${MYBINPATH}) + ENDFOREACH(MYPATH ) + IF(MYFOUND EQUAL 0) + SET(MY_ACCUM_BINARY_DEP ${MY_ACCUM_BINARY_DEP} ${MYBINPATH}) + ENDIF(MYFOUND EQUAL 0) + ENDIF(EXISTS ${MYBINPATH}) + #MESSAGE("${DEPNAME}_BINDEP searching -->${MYLIBNAME}${CMAKE_SHARED_MODULE_SUFFIX}<--in-->${MY_PATH_BIN}<--") +# FIND_FILE("${DEPNAME}_BINDEP" +# ${MYLIBNAME}${CMAKE_SHARED_MODULE_SUFFIX} +# PATHS ${MY_PATH_BIN} +# ) +# FIND_LIBRARY("${DEPNAME}_BINDEP" +# NAMES ${MYLIBRARY} +# PATHS ${MY_PATH_BIN} +# ) ENDIF(${DEPNAME}_LIBRARY) MARK_AS_ADVANCED("${DEPNAME}_LIBRARY") #MESSAGE( " ${DEPNAME}_LIBRARY --> ${${DEPNAME}_LIBRARY}<--") @@ -172,9 +172,9 @@ ENDMACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY SEARCHPATHLIST) #SET(MACRO_MESSAGE_DEBUG TRUE) MACRO(MACRO_MESSAGE MYTEXT) - IF(MACRO_MESSAGE_DEBUG) - MESSAGE("in file -->${CMAKE_CURRENT_LIST_FILE}<-- line -->${CMAKE_CURRENT_LIST_LINE}<-- message ${MYTEXT}") - ELSE(MACRO_MESSAGE_DEBUG) - MESSAGE(STATUS "in file -->${CMAKE_CURRENT_LIST_FILE}<-- line -->${CMAKE_CURRENT_LIST_LINE}<-- message ${MYTEXT}") - ENDIF(MACRO_MESSAGE_DEBUG) + IF(MACRO_MESSAGE_DEBUG) + MESSAGE("in file -->${CMAKE_CURRENT_LIST_FILE}<-- line -->${CMAKE_CURRENT_LIST_LINE}<-- message ${MYTEXT}") + ELSE(MACRO_MESSAGE_DEBUG) + MESSAGE(STATUS "in file -->${CMAKE_CURRENT_LIST_FILE}<-- line -->${CMAKE_CURRENT_LIST_LINE}<-- message ${MYTEXT}") + ENDIF(MACRO_MESSAGE_DEBUG) ENDMACRO(MACRO_MESSAGE MYTEXT)