[svn-r21664] Added solution folders for most of the projects. This still needs some polish - the solution folder assignment should go closer to the target declaration and not all projects are grouped (parallel, c++, fortran, hl, and a few others).

Tested on Windows.

14 files changed, 62 insertions, 0 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e45088..bb051b0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -220,6 +220,11 @@ ELSE (NOT HDF5_EXTERNALLY_CONFIGURED)
 ENDIF (NOT HDF5_EXTERNALLY_CONFIGURED)
 
 #-----------------------------------------------------------------------------
+# Allow Visual Studio solution directories
+#-----------------------------------------------------------------------------
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
+#-----------------------------------------------------------------------------
 # Targets built within this project are exported at Install time for use
 # by other projects using FindHDF5. 
 #-----------------------------------------------------------------------------
diff --git a/perform/CMakeLists.txt b/perform/CMakeLists.txt
index 95ffd30..e9a3beb 100644
--- a/perform/CMakeLists.txt
+++ b/perform/CMakeLists.txt
@@ -183,3 +183,11 @@ IF (H5_HAVE_PARALLEL)
     ADD_TEST (NAME PERFORM_mpi-perf COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:mpi-perf>)
   ENDIF (NOT WIN32)
 ENDIF (H5_HAVE_PARALLEL)
+
+#-- Put the tests in a solution folder in Visual Studio
+set_target_properties(h5perf_serial PROPERTIES FOLDER perform)
+set_target_properties(chunk         PROPERTIES FOLDER perform)
+set_target_properties(iopipe        PROPERTIES FOLDER perform)
+set_target_properties(overhead      PROPERTIES FOLDER perform)
+set_target_properties(perf_meta     PROPERTIES FOLDER perform)
+set_target_properties(zip_perf      PROPERTIES FOLDER perform)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c852787..c57c72e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -841,3 +841,8 @@ IF (HDF5_EXPORTED_TARGETS)
       RUNTIME DESTINATION ${HDF5_INSTALL_BIN_DIR} COMPONENT libraries
   )
 ENDIF (HDF5_EXPORTED_TARGETS)
+
+#-----------------------------------------------------------------------------
+# Add projects to Visual Studio solution files
+#-----------------------------------------------------------------------------
+set_target_properties(hdf5 PROPERTIES FOLDER libraries)
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ab19fea..95f021d 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -176,6 +176,7 @@ ADD_TEST (
 )
 ADD_TEST (NAME testhdf5 COMMAND $<TARGET_FILE:testhdf5>)
 SET_TESTS_PROPERTIES(testhdf5 PROPERTIES DEPENDS h5test-clear-testhdf5-objects)
+
   
 ##############################################################################
 ##############################################################################
@@ -313,6 +314,7 @@ ENDFOREACH (test ${H5_TESTS})
 
 SET_TESTS_PROPERTIES(flush2 PROPERTIES DEPENDS flush1)
 
+
 ##############################################################################
 ##############################################################################
 ###           A D D I T I O N A L   T E S T S                              ###
@@ -629,3 +631,17 @@ IF (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
 
 ENDIF (HDF5_BUILD_GENERATORS AND NOT BUILD_SHARED_LIBS)
 
+#-- Put the tests in a solution folder in Visual Studio
+set_target_properties(hdf5_test     PROPERTIES FOLDER libraries)
+FOREACH (test ${H5_TESTS})
+  set_target_properties(${test}     PROPERTIES FOLDER test)
+ENDFOREACH (test ${H5_TESTS})
+set_target_properties(testhdf5      PROPERTIES FOLDER test)
+set_target_properties(cache         PROPERTIES FOLDER test)
+set_target_properties(cache_api     PROPERTIES FOLDER test)
+set_target_properties(cache_tagging PROPERTIES FOLDER test)
+set_target_properties(ttsafe        PROPERTIES FOLDER test)
+set_target_properties(err_compat    PROPERTIES FOLDER test)
+set_target_properties(error_test    PROPERTIES FOLDER test)
+set_target_properties(links_env     PROPERTIES FOLDER test)
+
diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt
index 11cebca..07d7570 100644
--- a/tools/h5copy/CMakeLists.txt
+++ b/tools/h5copy/CMakeLists.txt
@@ -16,6 +16,8 @@ TARGET_LINK_LIBRARIES (h5copy  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 
 SET (H5_DEP_EXECUTABLES h5copy)
 
+set_target_properties(h5copy PROPERTIES FOLDER tools)
+
 ##############################################################################
 ##############################################################################
 ###           T E S T I N G                                                ###
diff --git a/tools/h5diff/CMakeLists.txt b/tools/h5diff/CMakeLists.txt
index 866102b..ec8600f 100644
--- a/tools/h5diff/CMakeLists.txt
+++ b/tools/h5diff/CMakeLists.txt
@@ -28,6 +28,8 @@ IF (H5_HAVE_PARALLEL)
   TARGET_LINK_LIBRARIES (ph5diff  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 ENDIF (H5_HAVE_PARALLEL)
 
+set_target_properties(h5diff PROPERTIES FOLDER tools)
+
 ##############################################################################
 ##############################################################################
 ###           T E S T I N G                                                ###
diff --git a/tools/h5dump/CMakeLists.txt b/tools/h5dump/CMakeLists.txt
index aafd14d..fbbe1ca 100644
--- a/tools/h5dump/CMakeLists.txt
+++ b/tools/h5dump/CMakeLists.txt
@@ -16,6 +16,8 @@ TARGET_LINK_LIBRARIES (h5dump  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 
 SET (H5_DEP_EXECUTABLES h5dump)
 
+set_target_properties(h5dump PROPERTIES FOLDER tools)
+
 ##############################################################################
 ##############################################################################
 ###           T E S T I N G                                                ###
diff --git a/tools/h5import/CMakeLists.txt b/tools/h5import/CMakeLists.txt
index abd0b7d..38e5cc1 100644
--- a/tools/h5import/CMakeLists.txt
+++ b/tools/h5import/CMakeLists.txt
@@ -16,6 +16,8 @@ TARGET_LINK_LIBRARIES (h5import  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 
 SET (H5_DEP_EXECUTABLES h5import)
 
+set_target_properties(h5import PROPERTIES FOLDER tools)
+
 ##############################################################################
 ##############################################################################
 ###           T E S T I N G                                                ###
@@ -29,6 +31,7 @@ IF (BUILD_TESTING)
   ADD_EXECUTABLE (h5importtest ${HDF5_TOOLS_H5IMPORT_SOURCE_DIR}/h5importtest.c)
   TARGET_NAMING (h5importtest ${LIB_TYPE})
   TARGET_LINK_LIBRARIES (h5importtest ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
+  set_target_properties(h5importtest PROPERTIES FOLDER tools)
 
   SET (HDF5_REFERENCE_CONF_FILES
       binfp64.conf
diff --git a/tools/h5jam/CMakeLists.txt b/tools/h5jam/CMakeLists.txt
index 9925e2a..00d2b24 100644
--- a/tools/h5jam/CMakeLists.txt
+++ b/tools/h5jam/CMakeLists.txt
@@ -33,6 +33,10 @@ SET (H5_DEP_EXECUTABLES
     h5unjam
 )
 
+FOREACH (tool ${H5_DEP_EXECUTABLES})
+  set_target_properties(${tool} PROPERTIES FOLDER tools)
+ENDFOREACH (tool ${H5_DEP_EXECUTABLES})
+
 ##############################################################################
 ##############################################################################
 ###           T E S T I N G                                                ###
diff --git a/tools/h5ls/CMakeLists.txt b/tools/h5ls/CMakeLists.txt
index 2cd11cd..5708a2d 100644
--- a/tools/h5ls/CMakeLists.txt
+++ b/tools/h5ls/CMakeLists.txt
@@ -18,6 +18,8 @@ SET (H5_DEP_EXECUTABLES
     h5ls
 )
 
+set_target_properties(h5ls PROPERTIES FOLDER tools)
+
 ##############################################################################
 ##############################################################################
 ###           T E S T I N G                                                ###
diff --git a/tools/h5repack/CMakeLists.txt b/tools/h5repack/CMakeLists.txt
index b2fb8d3..caa8601 100644
--- a/tools/h5repack/CMakeLists.txt
+++ b/tools/h5repack/CMakeLists.txt
@@ -26,6 +26,8 @@ TARGET_LINK_LIBRARIES (h5repack  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 
 SET (H5_DEP_EXECUTABLES h5repack)
 
+set_target_properties(h5repack PROPERTIES FOLDER tools)
+
 ##############################################################################
 ##############################################################################
 ###           T E S T I N G                                                ###
@@ -39,10 +41,12 @@ IF (BUILD_TESTING)
   ADD_EXECUTABLE (testh5repack_detect_szip ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/testh5repack_detect_szip.c)
   TARGET_NAMING (testh5repack_detect_szip ${LIB_TYPE})
   TARGET_LINK_LIBRARIES (testh5repack_detect_szip ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+  set_target_properties(testh5repack_detect_szip PROPERTIES FOLDER tools)
 
   ADD_EXECUTABLE (h5repacktest ${REPACK_COMMON_SRCS} ${HDF5_TOOLS_H5REPACK_SOURCE_DIR}/h5repacktst.c)
   TARGET_NAMING (h5repacktest ${LIB_TYPE})
   TARGET_LINK_LIBRARIES (h5repacktest  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_TEST_LIB_TARGET})
+  set_target_properties(h5repacktest PROPERTIES FOLDER tools)
 
   IF (HDF5_TEST_VFD)
     SET (VFD_LIST
diff --git a/tools/h5stat/CMakeLists.txt b/tools/h5stat/CMakeLists.txt
index a4b06a6..a6e9c24 100644
--- a/tools/h5stat/CMakeLists.txt
+++ b/tools/h5stat/CMakeLists.txt
@@ -16,6 +16,8 @@ TARGET_LINK_LIBRARIES (h5stat  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
 
 SET (H5_DEP_EXECUTABLES h5stat)
 
+set_target_properties(h5stat PROPERTIES FOLDER tools)
+
 ##############################################################################
 ##############################################################################
 ###           T E S T I N G                                                ###
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt
index 1e8afa1..578c54b 100644
--- a/tools/lib/CMakeLists.txt
+++ b/tools/lib/CMakeLists.txt
@@ -41,6 +41,9 @@ H5_SET_LIB_OPTIONS (
   HDF5_TOOLS_LIB_NAME_DEBUG
 )
 
+# Add the tools library to a Visual Studio solution file
+set_target_properties(hdf5_tools PROPERTIES FOLDER libraries)
+
 ##############################################################################
 ##############################################################################
 ###           I N S T A L L A T I O N                                      ###
diff --git a/tools/misc/CMakeLists.txt b/tools/misc/CMakeLists.txt
index 3e9fe69..5f62283 100644
--- a/tools/misc/CMakeLists.txt
+++ b/tools/misc/CMakeLists.txt
@@ -14,14 +14,17 @@ INCLUDE_DIRECTORIES (${HDF5_PROJECT_DIR}/test)
 ADD_EXECUTABLE (h5debug ${HDF5_TOOLS_MISC_SOURCE_DIR}/h5debug.c)
 TARGET_NAMING (h5debug ${LIB_TYPE})
 TARGET_LINK_LIBRARIES (h5debug ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
+set_target_properties(h5debug PROPERTIES FOLDER tools)
 
 ADD_EXECUTABLE (h5repart ${HDF5_TOOLS_MISC_SOURCE_DIR}/h5repart.c)
 TARGET_NAMING (h5repart ${LIB_TYPE})
 TARGET_LINK_LIBRARIES (h5repart ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
+set_target_properties(h5repart PROPERTIES FOLDER tools)
 
 ADD_EXECUTABLE (h5mkgrp ${HDF5_TOOLS_MISC_SOURCE_DIR}/h5mkgrp.c)
 TARGET_NAMING (h5mkgrp ${LIB_TYPE})
 TARGET_LINK_LIBRARIES (h5mkgrp  ${HDF5_TOOLS_LIB_TARGET} ${HDF5_LIB_TARGET})
+set_target_properties(h5mkgrp PROPERTIES FOLDER tools)
 
 SET (H5_DEP_EXECUTABLES
     h5debug
@@ -49,6 +52,7 @@ IF (BUILD_TESTING)
   ADD_EXECUTABLE (h5repart_test ${HDF5_TOOLS_MISC_SOURCE_DIR}/repart_test.c)
   TARGET_NAMING (h5repart_test ${LIB_TYPE})
   TARGET_LINK_LIBRARIES (h5repart_test ${HDF5_LIB_TARGET} ${HDF5_TOOLS_LIB_TARGET})
+  set_target_properties(h5repart_test PROPERTIES FOLDER tools)
   
   # --------------------------------------------------------------------
   # Copy all the HDF5 files from the test directory into the source directory