Show
Ignore:
Timestamp:
03/23/09 17:01:02 (5 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/pthreads/CMakeLists.txt

    r9359 r9949  
    2626IF(OPENTHREADS_SONAMES) 
    2727  SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION} SOVERSION ${OPENTHREADS_SOVERSION}) 
    28 ENDIF(OPENTHREADS_SONAMES) 
     28ENDIF() 
    2929 
    3030SET(CMAKE_REQUIRED_LIBRARIES_SAFE "${CMAKE_REQUIRED_LIBRARIES}") 
     
    3434IF(HAVE_PTHREAD_YIELD) 
    3535  ADD_DEFINITIONS(-DHAVE_PTHREAD_YIELD) 
    36 ELSE(HAVE_PTHREAD_YIELD) 
     36ELSE() 
    3737  # sched_yield appears not in libc, pthreads or whatever on some systems 
    3838  CHECK_FUNCTION_EXISTS(sched_yield HAVE_SCHED_YIELD) 
     
    4141    IF(HAVE_SCHED_YIELD) 
    4242      SET(CMAKE_THREAD_LIBS_INIT "${CMAKE_THREAD_LIBS_INIT} -lrt") 
    43     ENDIF(HAVE_SCHED_YIELD) 
    44   ENDIF(NOT HAVE_SCHED_YIELD) 
     43    ENDIF() 
     44  ENDIF() 
    4545  IF(HAVE_SCHED_YIELD) 
    4646    ADD_DEFINITIONS(-DHAVE_SCHED_YIELD) 
    47   ENDIF(HAVE_SCHED_YIELD) 
    48 ENDIF(HAVE_PTHREAD_YIELD) 
     47  ENDIF() 
     48ENDIF() 
    4949 
    5050IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") 
     
    5252  ADD_DEFINITIONS(-D_GNU_SOURCE) 
    5353  SET(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE") 
    54 ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") 
     54ENDIF() 
    5555 
    5656CHECK_FUNCTION_EXISTS(pthread_setconcurrency HAVE_PTHREAD_SETCONCURRENCY) 
    5757IF(HAVE_PTHREAD_SETCONCURRENCY) 
    5858  ADD_DEFINITIONS(-DHAVE_PTHREAD_SETCONCURRENCY) 
    59 ENDIF(HAVE_PTHREAD_SETCONCURRENCY) 
     59ENDIF() 
    6060 
    6161CHECK_FUNCTION_EXISTS(pthread_getconcurrency HAVE_PTHREAD_GETCONCURRENCY) 
    6262IF(HAVE_PTHREAD_GETCONCURRENCY) 
    6363  ADD_DEFINITIONS(-DHAVE_PTHREAD_GETCONCURRENCY) 
    64 ENDIF(HAVE_PTHREAD_GETCONCURRENCY) 
     64ENDIF() 
    6565 
    6666CHECK_FUNCTION_EXISTS(pthread_setaffinity_np HAVE_PTHREAD_SETAFFINITY_NP) 
    6767IF(HAVE_PTHREAD_SETAFFINITY_NP) 
    6868  ADD_DEFINITIONS(-DHAVE_PTHREAD_SETAFFINITY_NP) 
    69 ELSE(HAVE_PTHREAD_SETAFFINITY_NP) 
     69ELSE() 
    7070  CHECK_CXX_SOURCE_COMPILES(" 
    7171#include <sched.h> 
     
    7777  IF(HAVE_THREE_PARAM_SCHED_SETAFFINITY) 
    7878    ADD_DEFINITIONS(-DHAVE_THREE_PARAM_SCHED_SETAFFINITY) 
    79   ELSE(HAVE_THREE_PARAM_SCHED_SETAFFINITY) 
     79  ELSE() 
    8080    CHECK_CXX_SOURCE_COMPILES(" 
    8181#include <sched.h> 
     
    8787    IF(HAVE_TWO_PARAM_SCHED_SETAFFINITY) 
    8888      ADD_DEFINITIONS(-DHAVE_TWO_PARAM_SCHED_SETAFFINITY) 
    89     ENDIF(HAVE_TWO_PARAM_SCHED_SETAFFINITY) 
    90   ENDIF(HAVE_THREE_PARAM_SCHED_SETAFFINITY) 
    91 ENDIF(HAVE_PTHREAD_SETAFFINITY_NP) 
     89    ENDIF() 
     90  ENDIF() 
     91ENDIF() 
    9292 
    9393SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES_SAFE}")