Show
Ignore:
Timestamp:
09/19/14 12:35:23 (4 weeks ago)
Author:
robert
Message:

Moved widgets from VolumeEditorWidget? to TransferFunctionWidget?, and widget utilities into WidgetUtils?.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/CMakeModules/FindFBX.cmake

    r12706 r13466  
    1717ELSEIF(MSVC90) 
    1818    SET(FBX_LIBDIR "vs2008") 
    19 ELSEIF(MSVC10 OR MSVC_VERSION>1600) 
     19ELSEIF(MSVC10) 
    2020    SET(FBX_LIBDIR "vs2010") 
     21ELSEIF(MSVC11 OR MSVC_VERSION>1700) 
     22    SET(FBX_LIBDIR "vs2012") 
    2123ENDIF() 
    2224 
     
    3234 
    3335IF(APPLE) 
    34     SET(FBX_LIBNAME "fbxsdk-2012.1-static") 
     36    SET(FBX_LIBNAME "libfbxsdk") 
    3537ELSEIF(CMAKE_COMPILER_IS_GNUCXX) 
    36     SET(FBX_LIBNAME "fbxsdk-2012.1-static") 
     38    SET(FBX_LIBNAME "libfbxsdk") 
    3739ELSE() 
    38     SET(FBX_LIBNAME "fbxsdk-2012.1-md") 
     40    SET(FBX_LIBNAME "libfbxsdk-md") 
    3941ENDIF() 
    4042 
     
    4345SET( FBX_SEARCH_PATHS 
    4446    $ENV{FBX_DIR} 
    45     $ENV{ProgramW6432}/Autodesk/FBX/FbxSdk/2012.1 
    46     $ENV{PROGRAMFILES}/Autodesk/FBX/FbxSdk/2012.1 
    47     /Applications/Autodesk/FBXSDK20121 
     47    "$ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2014.1" 
     48    "$ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2014.1" 
     49    /Applications/Autodesk/FBXSDK20141 
    4850) 
    4951 
     
    5456FIND_LIBRARY( FBX_LIBRARY ${FBX_LIBNAME} 
    5557    PATHS ${FBX_SEARCH_PATHS} 
    56     PATH_SUFFIXES "lib/${FBX_LIBDIR}") 
     58    PATH_SUFFIXES "lib/${FBX_LIBDIR}/release" "lib/${FBX_LIBDIR}") 
     59 
     60#Once one of the calls succeeds the result variable will be set and stored in the cache so that no call will search again.     
     61 
     62#no debug d suffix, search in debug folder only 
     63FIND_LIBRARY( FBX_LIBRARY_DEBUG ${FBX_LIBNAME} 
     64    PATHS ${FBX_SEARCH_PATHS} 
     65    PATH_SUFFIXES "lib/${FBX_LIBDIR}/debug") 
    5766FIND_LIBRARY( FBX_LIBRARY_DEBUG ${FBX_LIBNAME_DEBUG} 
    5867    PATHS ${FBX_SEARCH_PATHS} 
    5968    PATH_SUFFIXES "lib/${FBX_LIBDIR}") 
    60  
     69     
    6170IF(FBX_LIBRARY AND FBX_LIBRARY_DEBUG AND FBX_INCLUDE_DIR) 
    6271    SET(FBX_FOUND "YES") 
     
    6473    SET(FBX_FOUND "NO") 
    6574ENDIF() 
     75 
     76IF(NOT FBX_FOUND) 
     77#try to use 2013.3 version 
     78    IF(APPLE) 
     79        SET(FBX_LIBNAME "fbxsdk-2013.3-static") 
     80    ELSEIF(CMAKE_COMPILER_IS_GNUCXX) 
     81        SET(FBX_LIBNAME "fbxsdk-2013.3-static") 
     82    ELSE() 
     83        SET(FBX_LIBNAME "fbxsdk-2013.3-md") 
     84    ENDIF() 
     85 
     86    SET(FBX_LIBNAME_DEBUG ${FBX_LIBNAME}d) 
     87 
     88    SET( FBX_SEARCH_PATHS 
     89        $ENV{FBX_DIR} 
     90        $ENV{ProgramW6432}/Autodesk/FBX/FBX SDK/2013.3 
     91        $ENV{PROGRAMFILES}/Autodesk/FBX/FBX SDK/2013.3 
     92        /Applications/Autodesk/FBXSDK20141 
     93    ) 
     94 
     95    # search for headers & debug/release libraries 
     96    FIND_PATH(FBX_INCLUDE_DIR "fbxsdk.h" 
     97        PATHS ${FBX_SEARCH_PATHS} 
     98        PATH_SUFFIXES "include") 
     99    FIND_LIBRARY( FBX_LIBRARY ${FBX_LIBNAME} 
     100        PATHS ${FBX_SEARCH_PATHS} 
     101        PATH_SUFFIXES "lib/${FBX_LIBDIR}") 
     102 
     103    FIND_LIBRARY( FBX_LIBRARY_DEBUG ${FBX_LIBNAME_DEBUG} 
     104        PATHS ${FBX_SEARCH_PATHS} 
     105        PATH_SUFFIXES "lib/${FBX_LIBDIR}") 
     106    IF(FBX_LIBRARY AND FBX_LIBRARY_DEBUG AND FBX_INCLUDE_DIR) 
     107        SET(FBX_FOUND "YES") 
     108    ELSE() 
     109        SET(FBX_FOUND "NO") 
     110    ENDIF() 
     111     
     112ENDIF()