summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-11-04 17:31:32 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-11-04 17:31:32 (GMT)
commit4c5c484b99322a64af076aaad23f68a6ee84e2c2 (patch)
tree604ed2e3da01b695e0bb5cb80602fcc3470e6943
parent5de79b88bfd73382a1557f86ec4783de74e30a87 (diff)
downloadhdf5-4c5c484b99322a64af076aaad23f68a6ee84e2c2.zip
hdf5-4c5c484b99322a64af076aaad23f68a6ee84e2c2.tar.gz
hdf5-4c5c484b99322a64af076aaad23f68a6ee84e2c2.tar.bz2
[svn-r21715] Correct SET_TARGET_PROPERTIES commands
-rw-r--r--CMakeLists.txt1
-rw-r--r--fortran/examples/CMakeLists.txt43
-rw-r--r--release_docs/USING_Windows.txt19
-rw-r--r--tools/h5copy/CMakeLists.txt2
-rw-r--r--tools/h5diff/CMakeLists.txt2
-rw-r--r--tools/lib/CMakeLists.txt4
6 files changed, 38 insertions, 33 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fb20b8f..1dbf756 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -620,6 +620,7 @@ ENDIF (HDF5_ENABLE_SZIP_SUPPORT)
OPTION (HDF5_PACKAGE_EXTLIBS "CPACK - include external libraries" OFF)
IF (NOT HDF5_EXTERNALLY_CONFIGURED)
IF (HDF5_PACKAGE_EXTLIBS)
+ SET (HDF5_NO_PACKAGES OFF CACHE BOOL "CPACK - Disable packaging" FORCE)
IF (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND)
PACKAGE_ZLIB_LIBRARY (${HDF5_ALLOW_EXTERNAL_SUPPORT} ${LIB_TYPE})
ENDIF (HDF5_ENABLE_Z_LIB_SUPPORT AND ZLIB_FOUND)
diff --git a/fortran/examples/CMakeLists.txt b/fortran/examples/CMakeLists.txt
index 3f3ae9f..8f858a3 100644
--- a/fortran/examples/CMakeLists.txt
+++ b/fortran/examples/CMakeLists.txt
@@ -65,31 +65,30 @@ FOREACH (example ${examples})
ENDFOREACH (example ${examples})
IF (FORTRAN_HAVE_ISO_C_BINDING AND HDF5_ENABLE_F2003)
-FOREACH (example ${F2003_examples})
- ADD_EXECUTABLE (f03_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
- TARGET_NAMING (f03_ex_${example} ${LIB_TYPE})
- TARGET_FORTRAN_WIN_PROPERTIES (f03_ex_${example} "")
- IF (WIN32 AND NOT CYGWIN)
- SET_PROPERTY (TARGET f03_ex_${example}
+ FOREACH (example ${F2003_examples})
+ ADD_EXECUTABLE (f03_ex_${example} ${HDF5_F90_EXAMPLES_SOURCE_DIR}/${example}.f90)
+ TARGET_NAMING (f03_ex_${example} ${LIB_TYPE})
+ TARGET_FORTRAN_WIN_PROPERTIES (f03_ex_${example} "")
+ IF (WIN32 AND NOT CYGWIN)
+ SET_PROPERTY (TARGET f03_ex_${example}
APPEND PROPERTY COMPILE_DEFINITIONS HDF5F90_WINDOWS
+ )
+ ENDIF (WIN32 AND NOT CYGWIN)
+ TARGET_LINK_LIBRARIES (f03_ex_${example}
+ ${HDF5_F90_LIB_TARGET}
+ ${HDF5_LIB_TARGET}
)
- ENDIF (WIN32 AND NOT CYGWIN)
- TARGET_LINK_LIBRARIES (f03_ex_${example}
- ${HDF5_F90_LIB_TARGET}
- ${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}>)
- IF (NOT "${last_test}" STREQUAL "")
- SET_TESTS_PROPERTIES (f03_ex_${example} PROPERTIES DEPENDS ${last_test})
- ENDIF (NOT "${last_test}" STREQUAL "")
- SET (last_test "f03_ex_${example}")
- ENDIF (BUILD_TESTING)
+ SET_TARGET_PROPERTIES (f03_ex_${example} PROPERTIES LINKER_LANGUAGE Fortran)
+ SET_TARGET_PROPERTIES (f03_ex_${example} PROPERTIES FOLDER examples/fortran03)
-ENDFOREACH (example ${F2003_examples})
+ IF (BUILD_TESTING)
+ ADD_TEST (NAME f03_ex_${example} COMMAND $<TARGET_FILE:f03_ex_${example}>)
+ IF (NOT "${last_test}" STREQUAL "")
+ SET_TESTS_PROPERTIES (f03_ex_${example} PROPERTIES DEPENDS ${last_test})
+ ENDIF (NOT "${last_test}" STREQUAL "")
+ SET (last_test "f03_ex_${example}")
+ ENDIF (BUILD_TESTING)
+ ENDFOREACH (example ${F2003_examples})
ENDIF (FORTRAN_HAVE_ISO_C_BINDING AND HDF5_ENABLE_F2003)
IF (H5_HAVE_PARALLEL AND MPI_Fortran_FOUND)
diff --git a/release_docs/USING_Windows.txt b/release_docs/USING_Windows.txt
index 4e78c68..410a759 100644
--- a/release_docs/USING_Windows.txt
+++ b/release_docs/USING_Windows.txt
@@ -87,7 +87,7 @@ Preconditions:
Variables" box.
In the New Variable window, set "Variable name" as HDF5_EXT_ZLIB and
- "Variable value" as zlib1.lib, then click OK.
+ "Variable value" as zlib.lib, then click OK.
Similarly, you can set:
@@ -98,7 +98,7 @@ Preconditions:
a. You will have to close and reopen running programs for the new
environment variable settings to take effect.
- b. c:\zlib\zlib1.dll and c:\szip\dll\szip.dll should be copied
+ b. c:\zlib\zlib.dll and c:\szip\dll\szip.dll should be copied
into a location that the application can find.
9. Set up path for libraries and headers
@@ -123,6 +123,16 @@ Preconditions:
9.4 If building Fortran applications, you will also need to setup the path
for the Intel Fortran compiler. Please see Section VI.
+
+ NOTE:
+ If you are using VS2010, the path settings will need to be in project
+ property sheets per project. Go to "Project" and select "Properties", find
+ "Configuration Properties", and then "VC++ Directories".
+
+ 9.1 If you are building on 64-bit Windows, find the "Platform" dropdown
+ and select "x64".
+ 9.2 Add the header path to the "Include Directories" setting.
+ 9.3 Add the library path to the "Library Directories" setting.
Notes:
@@ -595,7 +605,7 @@ Building with Visual Studio 2010 is very similar to building with Visual Studio
with the following considerations:
1. Visual Studio 2010 uses a new format for project files, but Visual Studio
- 2008 project files can be easily converted. The HDF5 project files
+ 2008 project files can be converted. The HDF5 project files
will need to be converted on first use. To do so:
1.1. Open the HDF5 Visual Studio 2008 solution file as in Section II
@@ -610,7 +620,8 @@ with the following considerations:
1.3. When it is finished, it should state that all projects were
converted successfully with no errors. Warnings can be ignored.
- 2. Once the project files have been converted, build and test normally.
+ 2. Once the project files have been converted you will need to create project
+ property sheets for the library and include paths. Then build and test normally.
Note that the converted project files aren't backwards compatible with
previous versions of Visual Studio.
diff --git a/tools/h5copy/CMakeLists.txt b/tools/h5copy/CMakeLists.txt
index b1cc40b..849c5c6 100644
--- a/tools/h5copy/CMakeLists.txt
+++ b/tools/h5copy/CMakeLists.txt
@@ -17,8 +17,6 @@ SET_TARGET_PROPERTIES (h5copy PROPERTIES FOLDER tools)
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 75e5e25..106ff30 100644
--- a/tools/h5diff/CMakeLists.txt
+++ b/tools/h5diff/CMakeLists.txt
@@ -30,8 +30,6 @@ IF (H5_HAVE_PARALLEL)
SET_TARGET_PROPERTIES (ph5diff PROPERTIES FOLDER tools)
ENDIF (H5_HAVE_PARALLEL)
-set_target_properties(h5diff PROPERTIES FOLDER tools)
-
##############################################################################
##############################################################################
### T E S T I N G ###
diff --git a/tools/lib/CMakeLists.txt b/tools/lib/CMakeLists.txt
index 578c54b..213d14d 100644
--- a/tools/lib/CMakeLists.txt
+++ b/tools/lib/CMakeLists.txt
@@ -40,9 +40,7 @@ H5_SET_LIB_OPTIONS (
HDF5_TOOLS_LIB_NAME_RELEASE
HDF5_TOOLS_LIB_NAME_DEBUG
)
-
-# Add the tools library to a Visual Studio solution file
-set_target_properties(hdf5_tools PROPERTIES FOLDER libraries)
+SET_TARGET_PROPERTIES (hdf5_tools PROPERTIES FOLDER libraries/tools)
##############################################################################
##############################################################################