diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-10-25 16:52:58 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-10-25 16:52:58 (GMT) |
| commit | c5e075851a9e7d2697b1e9ac77e8c18af595f332 (patch) | |
| tree | 0e5548899989eefe4575667a135dc2b8e5c7945a /fortran/test | |
| parent | fa4ab23b9ec53375d13ca43daad741f25215be6f (diff) | |
| download | hdf5-c5e075851a9e7d2697b1e9ac77e8c18af595f332.zip hdf5-c5e075851a9e7d2697b1e9ac77e8c18af595f332.tar.gz hdf5-c5e075851a9e7d2697b1e9ac77e8c18af595f332.tar.bz2 | |
[svn-r21667] Update FOLDER solution option for target properties. Added OPTION command for solution folder and no packaging.
Tested: local linux
Diffstat (limited to 'fortran/test')
| -rw-r--r-- | fortran/test/CMakeLists.txt | 13 |
1 files changed, 10 insertions, 3 deletions
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) |