From 53636db5bc0d37ac6397b0a2c15dad14dfb47ada Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 26 Jun 2008 15:06:44 +0000 Subject: [PATCH] From Mathias Froehlich, updated CMakeLists.txt to build the Atomic.cpp --- src/OpenThreads/sproc/CMakeLists.txt | 39 ++++++++++++++-------------- src/OpenThreads/win32/CMakeLists.txt | 39 ++++++++++++++-------------- 2 files changed, 40 insertions(+), 38 deletions(-) diff --git a/src/OpenThreads/sproc/CMakeLists.txt b/src/OpenThreads/sproc/CMakeLists.txt index f6aeb0842..9aee1bc07 100644 --- a/src/OpenThreads/sproc/CMakeLists.txt +++ b/src/OpenThreads/sproc/CMakeLists.txt @@ -6,18 +6,19 @@ SET(LIB_PUBLIC_HEADERS ${OpenThreads_PUBLIC_HEADERS}) ADD_LIBRARY(${LIB_NAME} ${OPENTHREADS_USER_DEFINED_DYNAMIC_OR_STATIC} ${LIB_PUBLIC_HEADERS} - SharedArena.c++ - SharedArena.h - SprocBarrier.c++ - SprocBarrierPrivateData.h - SprocCondition.c++ - SprocConditionPrivateData.h - SprocMutex.c++ - SprocMutexPrivateData.h - SprocThread.c++ - SprocThreadPrivateActions.h - SprocThreadPrivateData.h - ../common/Version.cpp + SharedArena.c++ + SharedArena.h + SprocBarrier.c++ + SprocBarrierPrivateData.h + SprocCondition.c++ + SprocConditionPrivateData.h + SprocMutex.c++ + SprocMutexPrivateData.h + SprocThread.c++ + SprocThreadPrivateActions.h + SprocThreadPrivateData.h + ../common/Version.cpp + ../common/Atomic.cpp ) IF(OPENTHREADS_SONAMES) @@ -32,18 +33,18 @@ ENDIF(OPENTHREADS_SONAMES) # their respective directories, we need to set the # link directory so it can find this location. LINK_DIRECTORIES( - ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ) INSTALL( - TARGETS OpenThreads - ARCHIVE DESTINATION lib${LIB_POSTFIX} - LIBRARY DESTINATION lib${LIB_POSTFIX} - RUNTIME DESTINATION bin + TARGETS OpenThreads + ARCHIVE DESTINATION lib${LIB_POSTFIX} + LIBRARY DESTINATION lib${LIB_POSTFIX} + RUNTIME DESTINATION bin ) INSTALL( - FILES ${OpenThreads_PUBLIC_HEADERS} - DESTINATION include/OpenThreads + FILES ${OpenThreads_PUBLIC_HEADERS} + DESTINATION include/OpenThreads ) #commented out# INCLUDE(ModuleInstall OPTIONAL) diff --git a/src/OpenThreads/win32/CMakeLists.txt b/src/OpenThreads/win32/CMakeLists.txt index a5be82fdd..069475c78 100644 --- a/src/OpenThreads/win32/CMakeLists.txt +++ b/src/OpenThreads/win32/CMakeLists.txt @@ -9,17 +9,18 @@ SET_SOURCE_FILES_PROPERTIES(${LIB_PUBLIC_HEADERS} PROPERTIES HEADER_FILE_ONLY ON ADD_LIBRARY(${LIB_NAME} ${OPENTHREADS_USER_DEFINED_DYNAMIC_OR_STATIC} ${LIB_PUBLIC_HEADERS} - HandleHolder.h - Win32BarrierPrivateData.h - WIN32Condition.cpp - Win32Condition.h - Win32ConditionPrivateData.h - Win32Mutex.cpp - Win32MutexPrivateData.h - Win32Thread.cpp - Win32ThreadBarrier.cpp - Win32ThreadPrivateData.h - ../common/Version.cpp + HandleHolder.h + Win32BarrierPrivateData.h + WIN32Condition.cpp + Win32Condition.h + Win32ConditionPrivateData.h + Win32Mutex.cpp + Win32MutexPrivateData.h + Win32Thread.cpp + Win32ThreadBarrier.cpp + Win32ThreadPrivateData.h + ../common/Version.cpp + ../common/Atomic.cpp ) @@ -31,22 +32,22 @@ ENDIF(OPENTHREADS_SONAMES) # their respective directories, we need to set the # link directory so it can find this location. LINK_DIRECTORIES( - ${CMAKE_CURRENT_BINARY_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ) IF(MSVC AND OSG_MSVC_VERSIONED_DLL) - HANDLE_MSVC_DLL(ot ${OPENTHREADS_SOVERSION}) + HANDLE_MSVC_DLL(ot ${OPENTHREADS_SOVERSION}) ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL) INSTALL( - TARGETS OpenThreads - ARCHIVE DESTINATION lib - LIBRARY DESTINATION lib - RUNTIME DESTINATION bin + TARGETS OpenThreads + ARCHIVE DESTINATION lib + LIBRARY DESTINATION lib + RUNTIME DESTINATION bin ) INSTALL( - FILES ${OpenThreads_PUBLIC_HEADERS} - DESTINATION include/OpenThreads + FILES ${OpenThreads_PUBLIC_HEADERS} + DESTINATION include/OpenThreads ) #commented out# INCLUDE(ModuleInstall OPTIONAL)