Sorry I sent you the wrong file for OpenThreads. The correct one is attached
(src/OpenThreads/win32/CMakeLists.txt)
Mourad
On Thu, Mar 10, 2011 at 3:01 PM, Mourad Boufarguine <
[email protected]> wrote:
> Hi Robert,
>
> I gave projects folders in VS a try, it works for applications, plugins and
> examples but not for the osg core libraries.
> Attached OsgMacroUtils.cmake is a tiny fix for this. OpenThreads is
> addressed seperately.
>
> Mourad
>
>
> On Wed, Mar 9, 2011 at 2:07 PM, Robert Osfield
> <[email protected]>wrote:
>
>> Hi Tassilio,
>>
>> I have just merged and checked in your changes. I made a few minor
>> tweaks to fit in with other changes that I checked in yesterday for
>> Android support, fingers crossed my tweaks won't have broken anything.
>>
>> Could you please try svn/trunk and let me know if everything is working.
>>
>> Thanks.
>> Robert.
>>
>> On Thu, Feb 24, 2011 at 1:28 PM, Tassilo Glander
>> <[email protected]> wrote:
>> > Hi,
>> >
>> > I patched the cmake configuration to support folders, which are really
>> handy to organize the many projects in the OSG solution into examples,
>> applications and core libs in the IDE.
>> > This feature has been introduced to cmake in 2.8.3, on older versions it
>> should be ignored silently. I tested on Visual Studio 2008 with cmake 2.8.3
>> and 2.8.4.
>> >
>> > See the screenshots for comparison [img]osg_solution.png[/img]
>> >
>> > This needs few changes:
>> >
>> > activate on global cmakelist.txt:
>> >
>> > [code]set_property(GLOBAL PROPERTY USE_FOLDERS On)[/code]
>> >
>> > set appropriate folder names for project type in osgMacroUtils.cmake:
>> >
>> > [code]SET_TARGET_PROPERTIES(${CORELIB_NAME} PROPERTIES FOLDER "OSG
>> Core")[/code]
>> >
>> > similar for examples, applications
>> >
>> > Thanks,
>> > Tassilo
>> >
>> > ------------------
>> > Read this topic online here:
>> > http://forum.openscenegraph.org/viewtopic.php?p=37090#37090
>> >
>> >
>> >
>> >
>> > Attachments:
>> > http://forum.openscenegraph.org//files/buildpatch_131.zip
>> > http://forum.openscenegraph.org//files/osg_solution_944.png
>> >
>> >
>> > _______________________________________________
>> > osg-submissions mailing list
>> > [email protected]
>> >
>> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
>> >
>> _______________________________________________
>> osg-submissions mailing list
>> [email protected]
>>
>> http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
>>
>
>
# This file should only be included when WIN32
SET(LIB_NAME OpenThreads)
SET(LIB_PUBLIC_HEADERS ${OpenThreads_PUBLIC_HEADERS})
ADD_DEFINITIONS(-DWIN32_LEAN_AND_MEAN)
ADD_DEFINITIONS(-D_WIN32_WINNT=0x0400)
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
Win32ConditionPrivateData.h
Win32Mutex.cpp
Win32MutexPrivateData.h
Win32Thread.cpp
Win32ThreadBarrier.cpp
Win32ThreadPrivateData.h
../common/Version.cpp
../common/Atomic.cpp
${OPENTHREADS_VERSIONINFO_RC}
)
SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES FOLDER "OSG Core")
IF(OPENTHREADS_SONAMES)
SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${OPENTHREADS_VERSION}
SOVERSION ${OPENTHREADS_SOVERSION})
ENDIF()
# 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()
INSTALL(
TARGETS OpenThreads
ARCHIVE DESTINATION lib COMPONENT libopenthreads-dev
LIBRARY DESTINATION lib COMPONENT libopenthreads
RUNTIME DESTINATION bin COMPONENT libopenthreads
)
INSTALL(
FILES ${OpenThreads_PUBLIC_HEADERS}
DESTINATION include/OpenThreads
COMPONENT libopenthreads-dev
)
#commented out# INCLUDE(ModuleInstall OPTIONAL)
_______________________________________________
osg-submissions mailing list
[email protected]
http://lists.openscenegraph.org/listinfo.cgi/osg-submissions-openscenegraph.org
