Changeset 9949 for OpenSceneGraph/trunk/src/OpenThreads/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/CMakeLists.txt (modified) (4 diffs)

OpenSceneGraph/trunk/src/OpenThreads/CMakeLists.txt

@@ -14 +14 @@
 # User Options
 OPTION(DYNAMIC_OPENTHREADS "Set to ON to build OpenThreads for dynamic linking.  Use OFF for static." ON)
-IF (DYNAMIC_OPENTHREADS)
+IF(DYNAMIC_OPENTHREADS)
     SET(OPENTHREADS_USER_DEFINED_DYNAMIC_OR_STATIC "SHARED")
-ELSE (DYNAMIC_OPENTHREADS)
+ELSE()
     SET(OPENTHREADS_USER_DEFINED_DYNAMIC_OR_STATIC "STATIC")
     SET(OT_LIBRARY_STATIC 1)
-ENDIF (DYNAMIC_OPENTHREADS)
+ENDIF()
 
 ################################################################################
@@ -36 +36 @@
     CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc.in"
                    "${OPENTHREADS_VERSIONINFO_RC}")
-ENDIF(MSVC)
+ENDIF()
 
 
@@ -67 +67 @@
         # In this case, only Sproc exists, so no option.
         SET(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS 1)
-    ELSE(CMAKE_USE_SPROC_INIT)
+    ELSE()
         IF(CMAKE_HAVE_SPROC_H)
             OPTION(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS "Set to ON to build OpenThreads against sproc instead of pthreads" OFF)
-        ENDIF(CMAKE_HAVE_SPROC_H)
-    ENDIF(CMAKE_USE_SPROC_INIT)
+        ENDIF()
+    ENDIF()
 ENDIF(CMAKE_SYSTEM MATCHES IRIX)
 
@@ -79 +79 @@
     IF(CYGWIN)
         SUBDIRS(pthreads)
-    ELSE(CYGWIN)
+    ELSE()
         # Everybody else including Msys should probably go here
         SUBDIRS(win32) 
         # examples)
-    ENDIF(CYGWIN)
-ELSE(WIN32)
+    ENDIF()
+ELSE()
     IF(UNIX)
         IF(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS)
             SUBDIRS(sproc)
-        ELSE(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS)
+        ELSE()
             SUBDIRS(pthreads)
-        ENDIF(OPENTHREADS_USE_SPROC_INSTEAD_OF_PTHREADS)
-    ELSE(UNIX)
+        ENDIF()
+    ELSE()
         MESSAGE("Sorry, OpenThreads may not support your platform")
-    ENDIF(UNIX)
-ENDIF(WIN32)
+    ENDIF()
+ENDIF()
 
 # Make sure everyone can find Config