Show
Ignore:
Timestamp:
03/23/09 17:01:02 (6 years ago)
Author:
robert
Message:

From Philip Lowman, "Here's the promised cleanup of the OSG's CMakeLists.txt files for the src/ folder. I'll submit the others separately.

Also, there was also a small bug in osgDB's CMakeLists.txt that was causing an error when I tested with CMake 2.4.4.

IF(${OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX} STREQUAL "quicktime")
was changed to
IF(OSG_DEFAULT_IMAGE_PLUGIN_FOR_OSX STREQUAL "quicktime")
"

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/OpenThreads/CMakeLists.txt

    r9794 r9949  
    1414# User Options 
    1515OPTION(DYNAMIC_OPENTHREADS "Set to ON to build OpenThreads for dynamic linking.  Use OFF for static." ON) 
    16 IF (DYNAMIC_OPENTHREADS) 
     16IF(DYNAMIC_OPENTHREADS) 
    1717    SET(OPENTHREADS_USER_DEFINED_DYNAMIC_OR_STATIC "SHARED") 
    18 ELSE (DYNAMIC_OPENTHREADS) 
     18ELSE() 
    1919    SET(OPENTHREADS_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC") 
    2020    SET(OT_LIBRARY_STATIC 1) 
    21 ENDIF (DYNAMIC_OPENTHREADS) 
     21ENDIF() 
    2222 
    2323################################################################################ 
     
    3636    CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc.in" 
    3737                   "${OPENTHREADS_VERSIONINFO_RC}") 
    38 ENDIF(MSVC) 
     38ENDIF() 
    3939 
    4040 
     
    6767        # In this case, only Sproc exists, so no option. 
    6868        SET(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS 1) 
    69     ELSE(CMAKE_USE_SPROC_INIT) 
     69    ELSE() 
    7070        IF(CMAKE_HAVE_SPROC_H) 
    7171            OPTION(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS "Set to ON to build OpenThreads against sproc instead of pthreads" OFF) 
    72         ENDIF(CMAKE_HAVE_SPROC_H) 
    73     ENDIF(CMAKE_USE_SPROC_INIT) 
     72        ENDIF() 
     73    ENDIF() 
    7474ENDIF(CMAKE_SYSTEM MATCHES IRIX) 
    7575 
     
    7979    IF(CYGWIN) 
    8080        SUBDIRS(pthreads) 
    81     ELSE(CYGWIN) 
     81    ELSE() 
    8282        # Everybody else including Msys should probably go here 
    8383        SUBDIRS(win32)  
    8484        # examples) 
    85     ENDIF(CYGWIN) 
    86 ELSE(WIN32) 
     85    ENDIF() 
     86ELSE() 
    8787    IF(UNIX) 
    8888        IF(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS) 
    8989            SUBDIRS(sproc) 
    90         ELSE(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS) 
     90        ELSE() 
    9191            SUBDIRS(pthreads) 
    92         ENDIF(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS) 
    93     ELSE(UNIX) 
     92        ENDIF() 
     93    ELSE() 
    9494        MESSAGE("Sorry, OpenThreads may not support your platform") 
    95     ENDIF(UNIX) 
    96 ENDIF(WIN32) 
     95    ENDIF() 
     96ENDIF() 
    9797 
    9898# Make sure everyone can find Config