summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2011-04-18 16:02:18 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2011-04-18 16:02:18 (GMT)
commita7c7fbfdf98d13c8ccbdd3be472270a1ae5c4cb2 (patch)
treeefe3265b8b15a0a2963718f76070cddae798ad76
parent53eb52807100a87f5d9237367cb3005cbef1d726 (diff)
downloadhdf5-a7c7fbfdf98d13c8ccbdd3be472270a1ae5c4cb2.zip
hdf5-a7c7fbfdf98d13c8ccbdd3be472270a1ae5c4cb2.tar.gz
hdf5-a7c7fbfdf98d13c8ccbdd3be472270a1ae5c4cb2.tar.bz2
[svn-r20543] revert install command for External library builds - copy of lib fails if permission to install location is denied. Does not affect build otherwise.
-rw-r--r--config/cmake/HDFMacros.cmake12
1 files changed, 6 insertions, 6 deletions
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake
index c5e512f..cf23846 100644
--- a/config/cmake/HDFMacros.cmake
+++ b/config/cmake/HDFMacros.cmake
@@ -12,7 +12,7 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic)
EXTERNALPROJECT_ADD (JPEG
SVN_REPOSITORY ${JPEG_URL}
# [SVN_REVISION rev]
-# INSTALL_COMMAND ""
+ INSTALL_COMMAND ""
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=OFF
-DJPEG_EXTERNALLY_CONFIGURED:BOOL=ON
@@ -26,7 +26,7 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic)
EXTERNALPROJECT_ADD (JPEG
URL ${JPEG_URL}
URL_MD5 ""
-# INSTALL_COMMAND ""
+ INSTALL_COMMAND ""
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=OFF
-DJPEG_EXTERNALLY_CONFIGURED:BOOL=ON
@@ -77,7 +77,7 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding)
EXTERNALPROJECT_ADD (SZIP
SVN_REPOSITORY ${SZIP_URL}
# [SVN_REVISION rev]
-# INSTALL_COMMAND ""
+ INSTALL_COMMAND ""
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DSZIP_EXTERNALLY_CONFIGURED:BOOL=ON
@@ -91,7 +91,7 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding)
EXTERNALPROJECT_ADD (SZIP
URL ${SZIP_URL}
URL_MD5 ""
-# INSTALL_COMMAND ""
+ INSTALL_COMMAND ""
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DSZIP_EXTERNALLY_CONFIGURED:BOOL=ON
@@ -156,7 +156,7 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype)
EXTERNALPROJECT_ADD (ZLIB
SVN_REPOSITORY ${ZLIB_URL}
# [SVN_REVISION rev]
-# INSTALL_COMMAND ""
+ INSTALL_COMMAND ""
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DZLIB_EXTERNALLY_CONFIGURED:BOOL=ON
@@ -170,7 +170,7 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype)
EXTERNALPROJECT_ADD (ZLIB
URL ${ZLIB_URL}
URL_MD5 ""
-# INSTALL_COMMAND ""
+ INSTALL_COMMAND ""
CMAKE_ARGS
-DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS}
-DZLIB_EXTERNALLY_CONFIGURED:BOOL=ON