It seemed odd that the Windows OpenThreads library would have "osg" and the OPENSCENEGRAPH_SOVERSION as the prefix.
These two files change that to use "openthreads" and OPENTHREADS_SOVERSION. So you get osg21-osg.dll, but openthreads8-OpenThreads.dll. Should the prefix be shorter? Use "ot" instead of "openthreads"? Or just continue using "osg"? (But osg8-OpenThreads.dll doesn't look right.) I only use OpenThreads in OSG. Do I remember correctly that it can be used outside? Has that been left alone? andy
OsgMacroUtils.cmake
Description: OsgMacroUtils.cmake
# This file should only be included when WIN32
SET(LIB_NAME OpenThreads)
SET(LIB_PUBLIC_HEADERS ${OpenThreads_PUBLIC_HEADERS})
SOURCE_GROUP("Header Files" FILES ${LIB_PUBLIC_HEADERS})
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
)
IF(OPENTHREADS_SONAMES)
SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION}
SOVERSION ${OPENTHREADS_SOVERSION})
ENDIF(OPENTHREADS_SONAMES)
# Since we're building different platforms binaries in
# their respective directories, we need to set the
# link directory so it can find this location.
LINK_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR}
)
IF(MSVC AND OSG_MSVC_VERSIONED_DLL)
HANDLE_MSVC_DLL(openthreads ${OPENTHREADS_SOVERSION})
ENDIF(MSVC AND OSG_MSVC_VERSIONED_DLL)
INSTALL(
TARGETS OpenThreads
ARCHIVE DESTINATION lib
LIBRARY DESTINATION lib
RUNTIME DESTINATION bin
)
INSTALL(
FILES ${OpenThreads_PUBLIC_HEADERS}
DESTINATION include/OpenThreads
)
#commented out# INCLUDE(ModuleInstall OPTIONAL)
_______________________________________________ osg-submissions mailing list [email protected] http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
