From b4b7a130639b8d4ef7e19dd551aa727cd796b262 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 23 Jul 2013 05:25:45 +0000 Subject: [PATCH] From Torben Dannhauer, "Please find attached further changes to make library auto detection functional again for some libraries: Find3rdPa..: Fix to find libxml2 FindCollada: Rearranged to handle different MSVC versions more effective. This file is already prepared for the upcoming VS 2013. FindNVTT: introduced management of debug libraries (also auto detected). " --- CMakeModules/Find3rdPartyDependencies.cmake | 6 +-- CMakeModules/FindCOLLADA.cmake | 12 ++++-- CMakeModules/FindNVTT.cmake | 46 +++++++++++++++++++++ 3 files changed, 57 insertions(+), 7 deletions(-) diff --git a/CMakeModules/Find3rdPartyDependencies.cmake b/CMakeModules/Find3rdPartyDependencies.cmake index 3fe3fea9c..29adf6ee0 100644 --- a/CMakeModules/Find3rdPartyDependencies.cmake +++ b/CMakeModules/Find3rdPartyDependencies.cmake @@ -54,7 +54,7 @@ ENDMACRO(FIND_DEPENDENCY DEPNAME INCLUDEFILE LIBRARY_NAMES_BASE SEARCHPATHLIST D ################################################################################################ -# this Macro is tailored to Mike dependencies +# this Macro is tailored to Mike and Torbens dependencies ################################################################################################ MACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN) @@ -86,14 +86,14 @@ MACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN) MARK_AS_ADVANCED(PNG_PNG_INCLUDE_DIR) ENDIF(PNG_FOUND) ENDIF(ZLIB_FOUND) - FIND_DEPENDENCY(LIBXML2 libxml "libxml2" ${OSG_3RDPARTY_BIN} "D" "") + FIND_DEPENDENCY(LIBXML2 libxml2 "libxml2" ${OSG_3RDPARTY_BIN} "D" "") IF(LIBXML2_FOUND) # The CMAKE find libxml module uses LIBXML2_LIBRARIES -> fill it.... kind of a hack SET(LIBXML2_LIBRARIES ${LIBXML2_LIBRARY} CACHE FILEPATH "" FORCE) SET(LIBXML2_XMLLINT_EXECUTABLE ${OSG_3RDPARTY_BIN}/bin/xmllint.exe CACHE FILEPATH "Path to xmllint executable" FORCE) ENDIF(LIBXML2_FOUND) #FIND_DEPENDENCY(DEPNAME INCLUDEFILE LIBRARY_NAMES_BASE SEARCHPATHLIST DEBUGSUFFIX EXSUFFIX) - FIND_Package(NVTT) + FIND_Package(NVTT) #luigi#INCLUDE(FindOSGDepends.cmake) ENDMACRO(SEARCH_3RDPARTY OSG_3RDPARTY_BIN) diff --git a/CMakeModules/FindCOLLADA.cmake b/CMakeModules/FindCOLLADA.cmake index 9da7be7e7..e7ae0c455 100644 --- a/CMakeModules/FindCOLLADA.cmake +++ b/CMakeModules/FindCOLLADA.cmake @@ -28,6 +28,10 @@ IF(APPLE) SET(COLLADA_BUILDNAME "mac") ELSEIF(MINGW) SET(COLLADA_BUILDNAME "mingw") +ELSEIF(MSVC12) + SET(COLLADA_BUILDNAME "vc12") +ELSEIF(MSVC11) + SET(COLLADA_BUILDNAME "vc11") ELSEIF(MSVC10) SET(COLLADA_BUILDNAME "vc10") ELSEIF(MSVC90) @@ -238,7 +242,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG ) FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY - NAMES libboost_filesystem boost_filesystem boost_filesystem-mt libboost_filesystem-vc90-mt libboost_filesystem-vc100-mt + NAMES libboost_filesystem boost_filesystem boost_filesystem-mt libboost_filesystem-${COLLADA_BUILDNAME}0-mt libboost_filesystem-${COLLADA_BUILDNAME}0-mt-1_54 PATHS ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME} ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw @@ -246,7 +250,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG ) FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY_DEBUG - NAMES libboost_filesystem-d boost_filesystem-d boost_filesystem-mt-d libboost_filesystem-vc90-mt-gd libboost_filesystem-vc100-mt-gd + NAMES libboost_filesystem-d boost_filesystem-d boost_filesystem-mt-d libboost_filesystem-${COLLADA_BUILDNAME}0-mt-gd libboost_filesystem-${COLLADA_BUILDNAME}0-mt-gd-1_54 PATHS ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME} ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw @@ -254,7 +258,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG ) FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY - NAMES libboost_system boost_system boost_system-mt libboost_system-vc90-mt libboost_system-vc100-mt + NAMES libboost_system boost_system boost_system-mt libboost_system-${COLLADA_BUILDNAME}0-mt libboost_system-${COLLADA_BUILDNAME}0-mt-1_54 PATHS ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME} ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw @@ -262,7 +266,7 @@ FIND_LIBRARY(COLLADA_STATIC_LIBRARY_DEBUG ) FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY_DEBUG - NAMES libboost_system-d boost_system-d boost_system-mt-d libboost_system-vc90-mt-gd libboost_system-vc100-mt-gd + NAMES libboost_system-d boost_system-d boost_system-mt-d libboost_system-${COLLADA_BUILDNAME}0-mt-gd libboost_system-${COLLADA_BUILDNAME}0-mt-gd-1_54 PATHS ${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME} ${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw diff --git a/CMakeModules/FindNVTT.cmake b/CMakeModules/FindNVTT.cmake index de1e6efeb..d82192a7a 100644 --- a/CMakeModules/FindNVTT.cmake +++ b/CMakeModules/FindNVTT.cmake @@ -15,6 +15,7 @@ FIND_PATH(NVTT_INCLUDE_DIR nvtt/nvtt.h PATH_SUFFIXES include ) +# NVTT FIND_LIBRARY(NVTT_LIBRARY NAMES nvtt PATHS @@ -25,6 +26,17 @@ FIND_LIBRARY(NVTT_LIBRARY PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static ) +FIND_LIBRARY(NVTT_LIBRARY_DEBUG + NAMES nvtt_d + PATHS + /usr/local + /usr + $ENV{NVTT_DIR} + ${3rdPartyRoot} + PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static +) + +# NVIMAGE FIND_LIBRARY(NVIMAGE_LIBRARY NAMES nvimage PATHS @@ -35,6 +47,17 @@ FIND_LIBRARY(NVIMAGE_LIBRARY PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static ) +FIND_LIBRARY(NVIMAGE_LIBRARY_DEBUG + NAMES nvimage_d + PATHS + /usr/local + /usr + $ENV{NVTT_DIR} + ${3rdPartyRoot} + PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static +) + +# NVMATH FIND_LIBRARY(NVMATH_LIBRARY NAMES nvmath PATHS @@ -45,6 +68,17 @@ FIND_LIBRARY(NVMATH_LIBRARY PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static ) +FIND_LIBRARY(NVMATH_LIBRARY_DEBUG + NAMES nvmath_d + PATHS + /usr/local + /usr + $ENV{NVTT_DIR} + ${3rdPartyRoot} + PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static +) + +# NVCORE FIND_LIBRARY(NVCORE_LIBRARY NAMES nvcore PATHS @@ -54,6 +88,18 @@ FIND_LIBRARY(NVCORE_LIBRARY ${3rdPartyRoot} PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static ) +FIND_LIBRARY(NVCORE_LIBRARY_DEBUG + NAMES nvcore_d + PATHS + /usr/local + /usr + $ENV{NVTT_DIR} + ${3rdPartyRoot} + PATH_SUFFIXES lib64 lib lib/shared lib/static lib64/static +) + + + SET(NVTT_FOUND "NO") IF(NVTT_LIBRARY AND NVTT_INCLUDE_DIR)