diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-05-18 14:46:50 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-05-18 14:46:50 (GMT) |
| commit | 976eb5e523ff339370e1387ef0490e4be1ac879f (patch) | |
| tree | 279ffa9171509965a61d65355913f9e4cd38de91 | |
| parent | aee3e0b0478eea56bade045c85a6cc17ed125051 (diff) | |
| download | hdf5-976eb5e523ff339370e1387ef0490e4be1ac879f.zip hdf5-976eb5e523ff339370e1387ef0490e4be1ac879f.tar.gz hdf5-976eb5e523ff339370e1387ef0490e4be1ac879f.tar.bz2 | |
[svn-r20858] Correct state of EXTERNALLY_CONFIGURED when using EXTERNAL_PROJECT for extlibs.
| -rw-r--r-- | config/cmake/HDFMacros.cmake | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/config/cmake/HDFMacros.cmake b/config/cmake/HDFMacros.cmake index 2d7773e..28f9eba 100644 --- a/config/cmake/HDFMacros.cmake +++ b/config/cmake/HDFMacros.cmake @@ -15,7 +15,7 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic) INSTALL_COMMAND "" CMAKE_ARGS -DBUILD_SHARED_LIBS:BOOL=OFF - -DJPEG_EXTERNALLY_CONFIGURED:BOOL=ON + -DJPEG_EXTERNALLY_CONFIGURED:BOOL=OFF -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} @@ -29,7 +29,7 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic) INSTALL_COMMAND "" CMAKE_ARGS -DBUILD_SHARED_LIBS:BOOL=OFF - -DJPEG_EXTERNALLY_CONFIGURED:BOOL=ON + -DJPEG_EXTERNALLY_CONFIGURED:BOOL=OFF -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} @@ -96,7 +96,7 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding) INSTALL_COMMAND "" CMAKE_ARGS -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} - -DSZIP_EXTERNALLY_CONFIGURED:BOOL=ON + -DSZIP_EXTERNALLY_CONFIGURED:BOOL=OFF -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} @@ -110,7 +110,7 @@ MACRO (EXTERNAL_SZIP_LIBRARY compress_type libtype encoding) INSTALL_COMMAND "" CMAKE_ARGS -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} - -DSZIP_EXTERNALLY_CONFIGURED:BOOL=ON + -DSZIP_EXTERNALLY_CONFIGURED:BOOL=OFF -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} @@ -192,7 +192,7 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype) INSTALL_COMMAND "" CMAKE_ARGS -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} - -DZLIB_EXTERNALLY_CONFIGURED:BOOL=ON + -DZLIB_EXTERNALLY_CONFIGURED:BOOL=OFF -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} @@ -206,7 +206,7 @@ MACRO (EXTERNAL_ZLIB_LIBRARY compress_type libtype) INSTALL_COMMAND "" CMAKE_ARGS -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} - -DZLIB_EXTERNALLY_CONFIGURED:BOOL=ON + -DZLIB_EXTERNALLY_CONFIGURED:BOOL=OFF -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} |