[brlcad-commits] SF.net SVN: brlcad:[60305] brlcad/trunk

[<sta...@us...>]

Revision: 60305
          http://sourceforge.net/p/brlcad/code/60305
Author:   starseeker
Date:     2014-03-31 13:52:52 +0000 (Mon, 31 Mar 2014)
Log Message:
-----------
Start to make use of the FOLDERS property to group targets.  To do this properly requires allowing the BRLCAD_EXEC macro and friends to supply a folder, which is more work, but even just this level helps to organize things.

Modified Paths:
--------------
    brlcad/trunk/CMakeLists.txt
    brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
    brlcad/trunk/misc/CMake/DocBook.cmake

Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt	2014-03-31 12:52:15 UTC (rev 60304)
+++ brlcad/trunk/CMakeLists.txt	2014-03-31 13:52:52 UTC (rev 60305)
@@ -1218,6 +1218,13 @@
 endif(BRLCAD_ENABLE_SMP)
 
 #----------------------------------------------------------------------
+# Some generators in CMake support generating folders in IDEs for
+# organizing build targets.  We want to use them if they are there.
+if(MSVC)
+  set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+endif(MSVC)
+
+#----------------------------------------------------------------------
 # There are extra documentation files available requiring DocBook
 # They are quite useful in graphical interfaces, but also add considerably
 # to the overall build time.  If necessary BRL-CAD provides its own

Modified: brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake
===================================================================
--- brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake	2014-03-31 12:52:15 UTC (rev 60304)
+++ brlcad/trunk/misc/CMake/BRLCAD_Targets.cmake	2014-03-31 13:52:52 UTC (rev 60305)
@@ -215,6 +215,7 @@
 
   # Call standard CMake commands
   add_executable(${execname} ${srcslist})
+  set_target_properties(${execname} PROPERTIES FOLDER "BRL-CAD Executables")
   target_link_libraries(${execname} ${libslist})
   VALIDATE_TARGET_STYLE(${execname})
 
@@ -328,6 +329,7 @@
   if(BUILD_SHARED_LIBS)
 
     add_library(${libname} SHARED ${srcslist})
+    set_target_properties(${libname} PROPERTIES FOLDER "BRL-CAD Shared Libs")
     VALIDATE_TARGET_STYLE(${libname})
 
     # Make sure we don't end up with outputs named liblib...
@@ -396,6 +398,7 @@
   # respect standard naming conventions.)
   if(BUILD_STATIC_LIBS)
     add_library(${libname}-static STATIC ${srcslist})
+    set_target_properties(${libname}-static PROPERTIES FOLDER "BRL-CAD Static Libs")
     VALIDATE_TARGET_STYLE(${libname}-static)
 
     # Make sure we don't end up with outputs named liblib...
@@ -704,6 +707,7 @@
 
   # Define the target and add it to this directories list of data targets
   add_custom_target(${targetname}_cp ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/${targetname}.sentinel)
+  set_target_properties(${targetname}_cp PROPERTIES FOLDER "BRL-CAD File Copying")
   BRLCAD_ADD_DIR_LIST_ENTRY(DATA_TARGETS "${CMAKE_CURRENT_BINARY_DIR}" ${targetname}_cp)
 
   # Add outputs to the distclean rules - this is consistent regardless of what type the output

Modified: brlcad/trunk/misc/CMake/DocBook.cmake
===================================================================
--- brlcad/trunk/misc/CMake/DocBook.cmake	2014-03-31 12:52:15 UTC (rev 60304)
+++ brlcad/trunk/misc/CMake/DocBook.cmake	2014-03-31 13:52:52 UTC (rev 60305)
@@ -196,6 +196,7 @@
 	DEPENDS ${full_path_filename} ${xml_valid_stamp} ${XSLTPROC_EXECUTABLE_TARGET} ${DOCBOOK_RESOURCE_FILES} ${XSL_XHTML_STYLESHEET} ${deps_list}
 	)
       add_custom_target(${targetname} ALL DEPENDS ${outfile})
+      set_target_properties(${targetname} PROPERTIES FOLDER "DocBook/HTML")
 
       # CMAKE_CFG_INTDIR can't be used in installation rules:
       # http://www.cmake.org/Bug/view.php?id=5747
@@ -262,6 +263,7 @@
 	DEPENDS ${full_path_filename} ${xml_valid_stamp} ${XSLTPROC_EXECUTABLE_TARGET} ${DOCBOOK_RESOURCE_FILES} ${XSL_MAN_STYLESHEET} ${deps_list}
 	)
       add_custom_target(${targetname} ALL DEPENDS ${outfile})
+      set_target_properties(${targetname} PROPERTIES FOLDER "DocBook/MAN")
 
       # CMAKE_CFG_INTDIR can't be used in installation rules:
       # http://www.cmake.org/Bug/view.php?id=5747
@@ -334,6 +336,7 @@
 	DEPENDS ${fo_outfile} ${DOCBOOK_RESOURCE_FILES} ${deps_list}
 	)
       add_custom_target(${targetname} ALL DEPENDS ${outfile})
+      set_target_properties(${targetname} PROPERTIES FOLDER "DocBook/PDF")
       # CMAKE_CFG_INTDIR can't be used in installation rules:
       # http://www.cmake.org/Bug/view.php?id=5747
       if(CMAKE_CONFIGURATION_TYPES)

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.