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")
"
This commit is contained in:
@@ -13,12 +13,12 @@ INCLUDE(CheckAtomicOps)
|
||||
|
||||
# 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()
|
||||
|
||||
################################################################################
|
||||
# Set Config file
|
||||
@@ -35,7 +35,7 @@ IF(MSVC)
|
||||
SET(OPENTHREADS_VERSIONINFO_RC "${PROJECT_BINARY_DIR}/PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc")
|
||||
CONFIGURE_FILE("${PROJECT_SOURCE_DIR}/PlatformSpecifics/Windows/OpenThreadsVersionInfo.rc.in"
|
||||
"${OPENTHREADS_VERSIONINFO_RC}")
|
||||
ENDIF(MSVC)
|
||||
ENDIF()
|
||||
|
||||
|
||||
# INSTALL_FILES(/include/OpenThreads/ FILES "${OPENTHREADS_CONFIG_HEADER}")
|
||||
@@ -66,11 +66,11 @@ IF(CMAKE_SYSTEM MATCHES IRIX)
|
||||
IF(CMAKE_USE_SPROC_INIT)
|
||||
# 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)
|
||||
|
||||
# Maybe we should be using the FindThreads.cmake module?
|
||||
@@ -78,22 +78,22 @@ IF(WIN32)
|
||||
# So I think Cygwin wants to use pthreads
|
||||
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
|
||||
INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}/include)
|
||||
|
||||
Reference in New Issue
Block a user