Changeset 13042

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

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

Location:
OpenSceneGraph/trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/CMakeLists.txt

    r13037 r13042  
    189189IF(NOT ANDROID) 
    190190IF(APPLE) 
     191    # Determine the canonical name of the selected Platform SDK 
     192    EXECUTE_PROCESS(COMMAND "defaults" "read" "${CMAKE_OSX_SYSROOT}/SDKSettings.plist" "CanonicalName" 
     193                    OUTPUT_VARIABLE APPLE_PLATFORM_SDK_CANONICAL_NAME 
     194                    OUTPUT_STRIP_TRAILING_WHITESPACE) 
     195 
    191196    # Trying to get CMake to generate an XCode IPhone project, current efforts are to get iphoneos sdk 3.1 working 
    192197    # Added option which needs manually setting to select the IPhone SDK for building. We can only have one of the below 
     
    820825        # Seems like a good place to add version specific compiler flags too. 
    821826        IF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE) 
    822             # This is really fragile, but CMake doesn't provide the OS system 
    823             # version information we need. (Darwin versions can be changed 
    824             # independently of OS X versions.) 
    825             IF (${CMAKE_OSX_SYSROOT} STREQUAL "/Developer/SDKs/MacOSX10.7.sdk") 
     827            IF(${APPLE_PLATFORM_SDK_CANONICAL_NAME} STREQUAL "macosx10.7") 
    826828                SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "imageio" CACHE STRING "Forced imageio default image plugin for OSX" FORCE) 
    827829                # 64 Bit Works, PPC is not supported any more 
    828830                SET(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Build architectures for OSX" FORCE) 
    829831                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.7 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE) 
    830             ELSEIF(${CMAKE_OSX_SYSROOT} STREQUAL "/Developer/SDKs/MacOSX10.5.sdk" OR ${CMAKE_OSX_SYSROOT} STREQUAL "/Developer/SDKs/MacOSX10.6.sdk")  
     832            ELSEIF(${APPLE_PLATFORM_SDK_CANONICAL_NAME} STREQUAL "macosx10.6" / 
     833                   ${APPLE_PLATFORM_SDK_CANONICAL_NAME} STREQUAL "macosx10.5") 
    831834                SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "imageio" CACHE STRING "Forced imageio default image plugin for OSX" FORCE) 
    832835                # 64-bit compiles are not supported with Carbon.  
    833836                SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE) 
    834837                SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5 -ftree-vectorize -fvisibility-inlines-hidden" CACHE STRING "Flags used by the compiler during all build types." FORCE) 
    835             ELSEIF(EXISTS /Developer/SDKs/MacOSX10.4u.sdk) 
     838            ELSEIF(${APPLE_PLATFORM_SDK_CANONICAL_NAME} STREQUAL "macosx10.4") 
    836839                SET(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX "quicktime" CACHE STRING "Forced imageio default image plugin for OSX" FORCE) 
    837840                SET(CMAKE_OSX_ARCHITECTURES "ppc;i386" CACHE STRING "Build architectures for OSX" FORCE) 
     
    842845                # but the SDK detection is too unreliable here. 
    843846            ENDIF() 
    844         ENDIF(NOT OSG_CONFIG_HAS_BEEN_RUN_BEFORE) 
     847        ENDIF() 
    845848 
    846849        OPTION(OSG_BUILD_APPLICATION_BUNDLES "Enable the building of applications and examples as OSX Bundles" OFF) 
     
    882885    SET(GENERATE_HTMLHELP "NO") 
    883886    IF(DOCUMENTATION_HTML_HELP) 
    884         # on windows Documentation.cmake finds the html help workshop fi it exists. On u*ix we might have it with wine but no way to point it out 
     887        # on windows Documentation.cmake finds the html help workshop if it exists. On u*ix we might have it with wine but no way to point it out 
    885888        IF(NOT WIN32) 
    886889            SET(HTML_HELP_COMPILER "" CACHE FILEPATH "Enter location of the HTML help compiler to let doxygen compile html") 
    887890            MARK_AS_ADVANCED(HTML_HELP_COMPILER) 
    888891        ENDIF() 
    889         # this var sets a proper value in .doxygen files when coniguring them below 
     892        # this var sets a proper value in .doxygen files when configuring them below 
    890893        SET(GENERATE_HTMLHELP "YES") 
    891894    endif() 
  • OpenSceneGraph/trunk/src/osgViewer/CMakeLists.txt

    r12996 r13042  
    6969            SET(OSG_WINDOWING_SYSTEM "IOS" CACHE STRING "Windowing system type for graphics window creation, options only IOS.") 
    7070        ELSE() 
    71             IF (${CMAKE_OSX_SYSROOT} STREQUAL "/Developer/SDKs/MacOSX10.7.sdk" OR ${CMAKE_OSX_SYSROOT} STREQUAL "/Developer/SDKs/MacOSX10.6.sdk" OR ${CMAKE_OSX_SYSROOT} STREQUAL "/Developer/SDKs/MacOSX10.5.sdk") 
    72  
     71            IF(${APPLE_PLATFORM_SDK_CANONICAL_NAME} STREQUAL "macosx10.7" OR 
     72               ${APPLE_PLATFORM_SDK_CANONICAL_NAME} STREQUAL "macosx10.6" OR 
     73               ${APPLE_PLATFORM_SDK_CANONICAL_NAME} STREQUAL "macosx10.5") 
    7374                SET(OSG_WINDOWING_SYSTEM "Cocoa" CACHE STRING "Windowing system type for graphics window creation, options Carbon, Cocoa or X11.") 
    7475            ELSE()