|
Revision 9949, 1.5 kB
(checked in by robert, 4 years ago)
|
|
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")
"
|
| Line | |
|---|
| 1 | # This file should only be included when WIN32 |
|---|
| 2 | |
|---|
| 3 | SET(LIB_NAME OpenThreads) |
|---|
| 4 | SET(LIB_PUBLIC_HEADERS ${OpenThreads_PUBLIC_HEADERS}) |
|---|
| 5 | |
|---|
| 6 | SOURCE_GROUP("Header Files" FILES ${LIB_PUBLIC_HEADERS}) |
|---|
| 7 | SET_SOURCE_FILES_PROPERTIES(${LIB_PUBLIC_HEADERS} PROPERTIES HEADER_FILE_ONLY ON) |
|---|
| 8 | |
|---|
| 9 | ADD_LIBRARY(${LIB_NAME} |
|---|
| 10 | ${OPENTHREADS_USER_DEFINED_DYNAMIC_OR_STATIC} |
|---|
| 11 | ${LIB_PUBLIC_HEADERS} |
|---|
| 12 | HandleHolder.h |
|---|
| 13 | Win32BarrierPrivateData.h |
|---|
| 14 | WIN32Condition.cpp |
|---|
| 15 | Win32Condition.h |
|---|
| 16 | Win32ConditionPrivateData.h |
|---|
| 17 | Win32Mutex.cpp |
|---|
| 18 | Win32MutexPrivateData.h |
|---|
| 19 | Win32Thread.cpp |
|---|
| 20 | Win32ThreadBarrier.cpp |
|---|
| 21 | Win32ThreadPrivateData.h |
|---|
| 22 | ../common/Version.cpp |
|---|
| 23 | ../common/Atomic.cpp |
|---|
| 24 | ${OPENTHREADS_VERSIONINFO_RC} |
|---|
| 25 | ) |
|---|
| 26 | |
|---|
| 27 | |
|---|
| 28 | IF(OPENTHREADS_SONAMES) |
|---|
| 29 | SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION} SOVERSION ${OPENTHREADS_SOVERSION}) |
|---|
| 30 | ENDIF() |
|---|
| 31 | |
|---|
| 32 | # Since we're building different platforms binaries in |
|---|
| 33 | # their respective directories, we need to set the |
|---|
| 34 | # link directory so it can find this location. |
|---|
| 35 | LINK_DIRECTORIES( |
|---|
| 36 | ${CMAKE_CURRENT_BINARY_DIR} |
|---|
| 37 | ) |
|---|
| 38 | |
|---|
| 39 | IF(MSVC AND OSG_MSVC_VERSIONED_DLL) |
|---|
| 40 | HANDLE_MSVC_DLL(ot ${OPENTHREADS_SOVERSION}) |
|---|
| 41 | ENDIF() |
|---|
| 42 | |
|---|
| 43 | INSTALL( |
|---|
| 44 | TARGETS OpenThreads |
|---|
| 45 | ARCHIVE DESTINATION lib COMPONENT libopenthreads-dev |
|---|
| 46 | LIBRARY DESTINATION lib COMPONENT libopenthreads |
|---|
| 47 | RUNTIME DESTINATION bin COMPONENT libopenthreads |
|---|
| 48 | ) |
|---|
| 49 | INSTALL( |
|---|
| 50 | FILES ${OpenThreads_PUBLIC_HEADERS} |
|---|
| 51 | DESTINATION include/OpenThreads |
|---|
| 52 | COMPONENT libopenthreads-dev |
|---|
| 53 | ) |
|---|
| 54 | |
|---|
| 55 | #commented out# INCLUDE(ModuleInstall OPTIONAL) |
|---|