Changeset 9949 for OpenSceneGraph/trunk/src/OpenThreads/pthreads/CMakeLists.txt

Timestamp:

03/23/09 17:01:02 (4 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:

• OpenSceneGraph/trunk/src/OpenThreads/pthreads/CMakeLists.txt (modified) (6 diffs)

OpenSceneGraph/trunk/src/OpenThreads/pthreads/CMakeLists.txt

@@ -26 +26 @@
 IF(OPENTHREADS_SONAMES)
   SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION} SOVERSION ${OPENTHREADS_SOVERSION})
-ENDIF(OPENTHREADS_SONAMES)
+ENDIF()
 
 SET(CMAKE_REQUIRED_LIBRARIES_SAFE "${CMAKE_REQUIRED_LIBRARIES}")
@@ -34 +34 @@
 IF(HAVE_PTHREAD_YIELD)
   ADD_DEFINITIONS(-DHAVE_PTHREAD_YIELD)
-ELSE(HAVE_PTHREAD_YIELD)
+ELSE()
   # sched_yield appears not in libc, pthreads or whatever on some systems
   CHECK_FUNCTION_EXISTS(sched_yield HAVE_SCHED_YIELD)
@@ -41 +41 @@
     IF(HAVE_SCHED_YIELD)
       SET(CMAKE_THREAD_LIBS_INIT "${CMAKE_THREAD_LIBS_INIT} -lrt")
-    ENDIF(HAVE_SCHED_YIELD)
-  ENDIF(NOT HAVE_SCHED_YIELD)
+    ENDIF()
+  ENDIF()
   IF(HAVE_SCHED_YIELD)
     ADD_DEFINITIONS(-DHAVE_SCHED_YIELD)
-  ENDIF(HAVE_SCHED_YIELD)
-ENDIF(HAVE_PTHREAD_YIELD)
+  ENDIF()
+ENDIF()
 
 IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -52 +52 @@
   ADD_DEFINITIONS(-D_GNU_SOURCE)
   SET(CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS} -D_GNU_SOURCE")
-ENDIF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ENDIF()
 
 CHECK_FUNCTION_EXISTS(pthread_setconcurrency HAVE_PTHREAD_SETCONCURRENCY)
 IF(HAVE_PTHREAD_SETCONCURRENCY)
   ADD_DEFINITIONS(-DHAVE_PTHREAD_SETCONCURRENCY)
-ENDIF(HAVE_PTHREAD_SETCONCURRENCY)
+ENDIF()
 
 CHECK_FUNCTION_EXISTS(pthread_getconcurrency HAVE_PTHREAD_GETCONCURRENCY)
 IF(HAVE_PTHREAD_GETCONCURRENCY)
   ADD_DEFINITIONS(-DHAVE_PTHREAD_GETCONCURRENCY)
-ENDIF(HAVE_PTHREAD_GETCONCURRENCY)
+ENDIF()
 
 CHECK_FUNCTION_EXISTS(pthread_setaffinity_np HAVE_PTHREAD_SETAFFINITY_NP)
 IF(HAVE_PTHREAD_SETAFFINITY_NP)
   ADD_DEFINITIONS(-DHAVE_PTHREAD_SETAFFINITY_NP)
-ELSE(HAVE_PTHREAD_SETAFFINITY_NP)
+ELSE()
   CHECK_CXX_SOURCE_COMPILES("
 #include <sched.h>
@@ -77 +77 @@
   IF(HAVE_THREE_PARAM_SCHED_SETAFFINITY)
     ADD_DEFINITIONS(-DHAVE_THREE_PARAM_SCHED_SETAFFINITY)
-  ELSE(HAVE_THREE_PARAM_SCHED_SETAFFINITY)
+  ELSE()
     CHECK_CXX_SOURCE_COMPILES("
 #include <sched.h>
@@ -87 +87 @@
     IF(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
       ADD_DEFINITIONS(-DHAVE_TWO_PARAM_SCHED_SETAFFINITY)
-    ENDIF(HAVE_TWO_PARAM_SCHED_SETAFFINITY)
-  ENDIF(HAVE_THREE_PARAM_SCHED_SETAFFINITY)
-ENDIF(HAVE_PTHREAD_SETAFFINITY_NP)
+    ENDIF()
+  ENDIF()
+ENDIF()
 
 SET(CMAKE_REQUIRED_LIBRARIES "${CMAKE_REQUIRED_LIBRARIES_SAFE}")