[svn-r21667] Update FOLDER solution option for target properties. Added OPTION command for solution folder and no packaging.

Tested: local linux

4 files changed, 16 insertions, 3 deletions

diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt
index c051612..609d965 100644
--- a/fortran/examples/CMakeLists.txt
+++ b/fortran/examples/CMakeLists.txt
@@ -52,6 +52,7 @@ FOREACH (example ${examples})
       ${HDF5_LIB_TARGET}
   )
   SET_TARGET_PROPERTIES (f90_ex_${example} PROPERTIES LINKER_LANGUAGE Fortran)
+  SET_TARGET_PROPERTIES (f90_ex_${example} PROPERTIES FOLDER examples/fortran)
 
   IF (BUILD_TESTING)
     ADD_TEST (NAME f90_ex_${example} COMMAND $<TARGET_FILE:f90_ex_${example}>)
@@ -78,6 +79,7 @@ FOREACH (example ${F2003_examples})
       ${HDF5_LIB_TARGET}
   )
   SET_TARGET_PROPERTIES (f03_ex_${example} PROPERTIES LINKER_LANGUAGE Fortran)
+  SET_TARGET_PROPERTIES (f03_ex_${example} PROPERTIES FOLDER examples/fortran03)
 
   IF (BUILD_TESTING)
     ADD_TEST (NAME f03_ex_${example} COMMAND $<TARGET_FILE:f03_ex_${example}>)
@@ -106,6 +108,7 @@ IF (H5_HAVE_PARALLEL)
       ${HDF5_LIB_TARGET}
   )
   SET_TARGET_PROPERTIES (f90_ex_ph5example PROPERTIES LINKER_LANGUAGE Fortran)
+  SET_TARGET_PROPERTIES (f90_ex_ph5example PROPERTIES FOLDER examples/fortran)
 
   IF (BUILD_TESTING)
     ADD_TEST (NAME f90_ex_ph5example COMMAND $<TARGET_FILE:f90_ex_ph5example>)
diff --git a/fortran/src/CMakeLists.txt b/fortran/src/CMakeLists.txt
index bb927eb..bc6ab33 100644
--- a/fortran/src/CMakeLists.txt
+++ b/fortran/src/CMakeLists.txt
@@ -118,6 +118,7 @@ ADD_LIBRARY (${HDF5_F90_C_LIB_TARGET} ${LIB_TYPE} ${f90CStub_C_SRCS})
 TARGET_LINK_LIBRARIES (${HDF5_F90_C_LIB_TARGET} ${HDF5_LIB_TARGET})
 SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_C_LIB_TARGET}")
 H5_SET_LIB_OPTIONS (${HDF5_F90_C_LIB_TARGET} ${HDF5_F90_C_LIB_NAME} ${LIB_TYPE})
+SET_TARGET_PROPERTIES (${HDF5_F90_C_LIB_TARGET} PROPERTIES FOLDER libraries/fortran)
 
 #-----------------------------------------------------------------------------
 # Fortran 2003 standard
@@ -221,6 +222,7 @@ SET_TARGET_PROPERTIES (${HDF5_F90_LIB_TARGET} PROPERTIES LINKER_LANGUAGE Fortran
 TARGET_LINK_LIBRARIES (${HDF5_F90_LIB_TARGET} ${HDF5_F90_C_LIB_TARGET} ${HDF5_LIB_TARGET})
 SET_GLOBAL_VARIABLE (HDF5_LIBRARIES_TO_EXPORT "${HDF5_LIBRARIES_TO_EXPORT};${HDF5_F90_LIB_TARGET}")
 H5_SET_LIB_OPTIONS (${HDF5_F90_LIB_TARGET} ${HDF5_F90_LIB_NAME} ${LIB_TYPE})
+SET_TARGET_PROPERTIES (${HDF5_F90_LIB_TARGET} PROPERTIES FOLDER libraries/fortran)
 
 #-----------------------------------------------------------------------------
 # Add file(s) to CMake Install
diff --git a/fortran/test/CMakeLists.txt b/fortran/test/CMakeLists.txt
index 508eaa9..7342850 100644
--- a/fortran/test/CMakeLists.txt
+++ b/fortran/test/CMakeLists.txt
@@ -15,15 +15,16 @@ TARGET_LINK_LIBRARIES (${HDF5_F90_C_TEST_LIB_TARGET}
     ${HDF5_TEST_LIB_TARGET}
 )
 H5_SET_LIB_OPTIONS (${HDF5_F90_C_TEST_LIB_TARGET} ${HDF5_F90_C_TEST_LIB_NAME} ${LIB_TYPE})
+SET_TARGET_PROPERTIES (${HDF5_F90_C_TEST_LIB_TARGET} PROPERTIES FOLDER libraries/test/fortran)
 
 ADD_LIBRARY (${HDF5_F90_TEST_LIB_TARGET} ${LIB_TYPE} tf.f90)
 SET (SHARED_LINK_FLAGS " ")
 IF (WIN32 AND NOT CYGWIN)
   IF (BUILD_SHARED_LIBS)
     SET_PROPERTY (TARGET ${HDF5_F90_TEST_LIB_TARGET}
-	    APPEND PROPERTY COMPILE_DEFINITIONS
-		    BUILD_HDF5_DLL
-	)
+      APPEND PROPERTY COMPILE_DEFINITIONS
+        BUILD_HDF5_DLL
+  )
     IF (MSVC)
       SET (SHARED_LINK_FLAGS "/DLL")
     ENDIF (MSVC)
@@ -41,6 +42,7 @@ TARGET_LINK_LIBRARIES (${HDF5_F90_TEST_LIB_TARGET}
     ${HDF5_LIB_TARGET}
 )
 H5_SET_LIB_OPTIONS (${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_TEST_LIB_NAME} ${LIB_TYPE})
+SET_TARGET_PROPERTIES (${HDF5_F90_TEST_LIB_TARGET} PROPERTIES FOLDER libraries/test/fortran)
 
 #-----------------------------------------------------------------------------
 # Add Tests
@@ -74,6 +76,7 @@ IF (WIN32 AND MSVC)
   TARGET_LINK_LIBRARIES (testhdf5_fortran "ws2_32.lib")
 ENDIF (WIN32 AND MSVC)
 SET_TARGET_PROPERTIES (testhdf5_fortran PROPERTIES LINKER_LANGUAGE Fortran)
+SET_TARGET_PROPERTIES (testhdf5_fortran PROPERTIES FOLDER test/fortran)
 
 ADD_TEST (NAME testhdf5_fortran COMMAND $<TARGET_FILE:testhdf5_fortran>)
 
@@ -96,6 +99,7 @@ IF (WIN32 AND MSVC)
   TARGET_LINK_LIBRARIES (testhdf5_fortran_1_8 "ws2_32.lib")
 ENDIF (WIN32 AND MSVC)
 SET_TARGET_PROPERTIES (testhdf5_fortran_1_8 PROPERTIES LINKER_LANGUAGE Fortran)
+SET_TARGET_PROPERTIES (testhdf5_fortran_1_8 PROPERTIES FOLDER test/fortran)
 
 ADD_TEST (NAME testhdf5_fortran_1_8 COMMAND $<TARGET_FILE:testhdf5_fortran_1_8>)
 
@@ -120,6 +124,7 @@ IF (FORTRAN_HAVE_ISO_C_BINDING AND HDF5_ENABLE_F2003)
     TARGET_LINK_LIBRARIES (fortranlib_test_F03 "ws2_32.lib")
   ENDIF (WIN32 AND MSVC)
   SET_TARGET_PROPERTIES (fortranlib_test_F03 PROPERTIES LINKER_LANGUAGE Fortran)
+  SET_TARGET_PROPERTIES (fortranlib_test_F03 PROPERTIES FOLDER test/fortran)
 
   ADD_TEST (NAME fortranlib_test_F03 COMMAND $<TARGET_FILE:fortranlib_test_F03>)
 ENDIF (FORTRAN_HAVE_ISO_C_BINDING AND HDF5_ENABLE_F2003)
@@ -137,6 +142,7 @@ IF (WIN32 AND MSVC)
   TARGET_LINK_LIBRARIES (fflush1 "ws2_32.lib")
 ENDIF (WIN32 AND MSVC)
 SET_TARGET_PROPERTIES (fflush1 PROPERTIES LINKER_LANGUAGE Fortran)
+SET_TARGET_PROPERTIES (fflush1 PROPERTIES FOLDER test/fortran)
 
 ADD_TEST (NAME fflush1 COMMAND $<TARGET_FILE:fflush1>)
 
@@ -153,6 +159,7 @@ IF (WIN32 AND MSVC)
   TARGET_LINK_LIBRARIES (fflush2 "ws2_32.lib")
 ENDIF (WIN32 AND MSVC)
 SET_TARGET_PROPERTIES (fflush2 PROPERTIES LINKER_LANGUAGE Fortran)
+SET_TARGET_PROPERTIES (fflush2 PROPERTIES FOLDER test/fortran)
 
 ADD_TEST (NAME fflush2 COMMAND $<TARGET_FILE:fflush2>)
 SET_TESTS_PROPERTIES(fflush2 PROPERTIES DEPENDS fflush1)
diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt
index c71f679..b8647b6 100644
--- a/fortran/testpar/CMakeLists.txt
+++ b/fortran/testpar/CMakeLists.txt
@@ -27,5 +27,6 @@ IF (WIN32 AND MSVC)
   TARGET_LINK_LIBRARIES (parallel_test "ws2_32.lib")
 ENDIF (WIN32 AND MSVC)
 SET_TARGET_PROPERTIES (parallel_test PROPERTIES LINKER_LANGUAGE Fortran)
+SET_TARGET_PROPERTIES (parallel_test PROPERTIES FOLDER test/fortran)
 
 ADD_TEST (NAME parallel_test COMMAND ${MPIEXEC} ${MPIEXEC_PREFLAGS} ${MPIEXEC_NUMPROC_FLAG} ${MPIEXEC_MAX_NUMPROCS} ${MPIEXEC_POSTFLAGS} $<TARGET_FILE:parallel_test>)