From 39deb10f4a086fdabd4a297f19f10e5acdc3fd21 Mon Sep 17 00:00:00 2001
From: Allen Byrne <byrn@hdfgroup.org>
Date: Thu, 14 Apr 2011 17:09:24 -0500
Subject: [svn-r20506] Add missing cmake_install_prefix to external projects

---
 config/cmake/HDFMacros.cmake | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake
index 3b7ec43..c5e512f 100644
--- a/config/cmake/HDFMacros.cmake
+++ b/config/cmake/HDFMacros.cmake
@@ -12,10 +12,11 @@ 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
+            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
             -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
             -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
             -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
@@ -25,10 +26,11 @@ 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
+            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
             -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
             -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
             -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
@@ -75,10 +77,11 @@ 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
+            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
             -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
             -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
             -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
@@ -88,10 +91,11 @@ 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
+            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
             -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
             -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
             -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
@@ -152,10 +156,11 @@ 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
+            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
             -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
             -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
             -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
@@ -165,10 +170,11 @@ 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
+            -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX}
             -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
             -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}
             -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY:PATH=${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}
@@ -204,6 +210,7 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype)
       SET (ZLIB_LIBRARY "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${CMAKE_CFG_INTDIR}/libz${DBG_EXT}${CMAKE_STATIC_LIBRARY_SUFFIX}")
     ENDIF (WIN32 AND NOT MINGW)
   ENDIF (${libtype} MATCHES "SHARED")
+  
   SET (ZLIB_INCLUDE_DIR_GEN "${BINARY_DIR}")
   SET (ZLIB_INCLUDE_DIR "${SOURCE_DIR}/src")
   SET (ZLIB_FOUND 1)
-- 
cgit v0.12