Changeset 7380

Show
Ignore:
Timestamp:
09/10/07 18:06:23
Author:
robert
Message:

Maded versioning under Windows the default.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • OpenSceneGraph/trunk/CMakeLists.txt

    r7374 r7380  
    108108########################################################################################################## 
    109109 
    110        IF(MSVC) 
    111                IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7) 
    112                        MESSAGE("Warning:  disabling versioned options 2.4.6 exibits inconsintencies in .pdb naming, at least under MSVC, suggested upgrading at least to 2.4.7") 
    113                        SET(OSG_MSVC_VERSIONED_DLL OFF) 
    114                        SET(OSG_MSVC_DEBUG_INCREMENTAL_LINK ON) 
    115                ELSE(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7) 
    116        OPTION(OSG_MSVC_VERSIONED_DLL "Set to ON to build OpenSceneGraph with versioned dll names" OFF) 
    117                        MARK_AS_ADVANCED(OSG_MSVC_VERSIONED_DLL) 
    118        OPTION(OSG_MSVC_DEBUG_INCREMENTAL_LINK "Set to OFF to build OpenSceneGraph without incremental linking in debug (release is off by default)" ON) 
    119                        MARK_AS_ADVANCED(OSG_MSVC_DEBUG_INCREMENTAL_LINK) 
    120                        IF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK) 
    121                SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO") 
    122                SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO") 
    123                SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO") 
    124                        ENDIF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK) 
    125                ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7) 
    126        ENDIF(MSVC) 
     110    IF(MSVC) 
     111        IF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7) 
     112            MESSAGE("Warning:  disabling versioned options 2.4.6 exibits inconsintencies in .pdb naming, at least under MSVC, suggested upgrading at least to 2.4.7") 
     113            SET(OSG_MSVC_VERSIONED_DLL OFF) 
     114            SET(OSG_MSVC_DEBUG_INCREMENTAL_LINK ON) 
     115        ELSE(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7) 
     116            OPTION(OSG_MSVC_VERSIONED_DLL "Set to ON to build OpenSceneGraph with versioned dll names" ON) 
     117            MARK_AS_ADVANCED(OSG_MSVC_VERSIONED_DLL) 
     118            OPTION(OSG_MSVC_DEBUG_INCREMENTAL_LINK "Set to OFF to build OpenSceneGraph without incremental linking in debug (release is off by default)" ON) 
     119            MARK_AS_ADVANCED(OSG_MSVC_DEBUG_INCREMENTAL_LINK) 
     120            IF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK) 
     121                SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO") 
     122                SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO") 
     123                SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO") 
     124            ENDIF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK) 
     125        ENDIF(${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} EQUAL 4 AND ${CMAKE_PATCH_VERSION} LESS 7) 
     126    ENDIF(MSVC) 
    127127ENDIF(WIN32) 
    128128