From 6c94ea13eb5eff43665ab68416112b6fdcb09975 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 27 May 2011 09:08:48 +0000 Subject: [PATCH] From Jean-Sebastien Guay, "I like the recent addition that adds folders in the solution tree to better organize the numerous examples, libraries, plugins etc. I added two folders that were missing IMHO: packaging and documentation. " --- CMakeLists.txt | 3 +++ CMakeModules/OsgCPack.cmake | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 645526f39..149d9950b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -916,9 +916,12 @@ IF(BUILD_DOCUMENTATION) ADD_CUSTOM_TARGET(doc_openscenegraph ${DOXYGEN} ${PROJECT_BINARY_DIR}/doc/openscenegraph.doxyfile ) + SET_TARGET_PROPERTIES(doc_openscenegraph PROPERTIES FOLDER "Documentation") + ADD_CUSTOM_TARGET(doc_openthreads ${DOXYGEN} ${PROJECT_BINARY_DIR}/doc/openthreads.doxyfile ) + SET_TARGET_PROPERTIES(doc_openthreads PROPERTIES FOLDER "Documentation") ENDIF(BUILD_DOCUMENTATION) OPTION(BUILD_DASHBOARD_REPORTS "Set to ON to activate reporting of OpenSceneGraph builds here http://www.cdash.org/CDashPublic/index.php?project=OpenSceneGraph" OFF) diff --git a/CMakeModules/OsgCPack.cmake b/CMakeModules/OsgCPack.cmake index 3ac19fd27..706487231 100644 --- a/CMakeModules/OsgCPack.cmake +++ b/CMakeModules/OsgCPack.cmake @@ -118,6 +118,8 @@ MACRO(GENERATE_PACKAGING_TARGET package_name) # Create a target that creates the current package # and rename the package to give it proper filename ADD_CUSTOM_TARGET(${PACKAGE_TARGETNAME}) + SET_TARGET_PROPERTIES(${PACKAGE_TARGETNAME} PROPERTIES FOLDER "Packaging") + ADD_CUSTOM_COMMAND(TARGET ${PACKAGE_TARGETNAME} COMMAND ${CMAKE_CPACK_COMMAND} -C ${OSG_CPACK_CONFIGURATION} --config ${OpenSceneGraph_BINARY_DIR}/CPackConfig-${package_name}.cmake COMMENT "Run CPack packaging for ${package_name}..." @@ -127,6 +129,8 @@ MACRO(GENERATE_PACKAGING_TARGET package_name) ADD_CUSTOM_COMMAND(TARGET ${PACKAGE_ALL_TARGETNAME} COMMAND ${CMAKE_CPACK_COMMAND} -C ${OSG_CPACK_CONFIGURATION} --config ${OpenSceneGraph_BINARY_DIR}/CPackConfig-${package_name}.cmake ) + SET_TARGET_PROPERTIES(${PACKAGE_ALL_TARGETNAME} PROPERTIES FOLDER "Packaging") + ENDMACRO(GENERATE_PACKAGING_TARGET) # Create configs and targets for a package including all components