[osg-submissions] atomic operations not pulling windows.h

[Robert Osfield]

Hi J-S,

Thanks for the file.  Mathias's original submission had the Atmoic.cpp
correctly in place, but... I missed checking it in, but this is now
down.

Robert.

On Thu, Jun 26, 2008 at 3:01 PM, Jean-Sébastien Guay
<jean-sebastien.guay at cm-labs.com> wrote:
> Hi Mathias, Robert,
>
>> Thanks for the fixes/changes, now merged and submitted to SVN.
>
> I did an svn update, deleted my build directory and generated the build
> files from scratch using CMake 2.6, then tried to build.
>
> The only issue is that the new Atomic.cpp is not added to the project. So
> adding it in src/OpenThreads/win32/CMakeLists.txt fixes that.
>
> So OSG now builds again. I've done some quick testing and all looks well.
>
> Updated src/OpenThreads/win32/CMakeLists.txt attached.
>
> J-S
> --
> ______________________________________________________
> Jean-Sebastien Guay    jean-sebastien.guay at cm-labs.com
>                               http://www.cm-labs.com/
>                        http://whitestar02.webhop.org/
>
> # 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
>        ../common/Atomic.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(ot ${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
> osg-submissions at lists.openscenegraph.org
> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
>
>