diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2011-12-14 21:26:17 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2011-12-14 21:26:17 (GMT) |
| commit | 5568b320b9907a23fd358d837712f6b09ea2be96 (patch) | |
| tree | d86e84b4add431769bae5458397d8fd374dd137d /config | |
| parent | 993c56b85961fd09e7c680edf9a63ae92d4fad71 (diff) | |
| download | hdf5-5568b320b9907a23fd358d837712f6b09ea2be96.zip hdf5-5568b320b9907a23fd358d837712f6b09ea2be96.tar.gz hdf5-5568b320b9907a23fd358d837712f6b09ea2be96.tar.bz2 | |
[svn-r21829] synch common macros files with new hdf4 option to build shared jpeg libray - JIRA 1276.
Diffstat (limited to 'config')
| -rw-r--r-- | config/cmake/HDFLibMacros.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config/cmake/HDFLibMacros.cmake b/config/cmake/HDFLibMacros.cmake index f9f4d55..aa4aad1 100644 --- a/config/cmake/HDFLibMacros.cmake +++ b/config/cmake/HDFLibMacros.cmake @@ -1,5 +1,5 @@ #------------------------------------------------------------------------------- -MACRO (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic) +MACRO (EXTERNAL_JPEG_LIBRARY compress_type libtype jpeg_pic) # May need to build JPEG with PIC on x64 machines with gcc # Need to use CMAKE_ANSI_CFLAGS define so that compiler test works @@ -9,7 +9,7 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic) # [SVN_REVISION rev] INSTALL_COMMAND "" CMAKE_ARGS - -DBUILD_SHARED_LIBS:BOOL=OFF + -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} -DJPEG_EXTERNALLY_CONFIGURED:BOOL=OFF -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} @@ -24,7 +24,7 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic) URL_MD5 "" INSTALL_COMMAND "" CMAKE_ARGS - -DBUILD_SHARED_LIBS:BOOL=OFF + -DBUILD_SHARED_LIBS:BOOL=${BUILD_SHARED_LIBS} -DJPEG_EXTERNALLY_CONFIGURED:BOOL=OFF -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} -DCMAKE_INSTALL_PREFIX:PATH=${CMAKE_INSTALL_PREFIX} @@ -47,7 +47,7 @@ MACRO (EXTERNAL_JPEG_LIBRARY compress_type jpeg_pic) ENDIF (${CMAKE_BUILD_TYPE} MATCHES "Debug") # Create imported target szip - ADD_LIBRARY(jpeg STATIC IMPORTED) + ADD_LIBRARY(jpeg ${libtype} IMPORTED) ADD_DEPENDENCIES (jpeg JPEG) IF (${libtype} MATCHES "SHARED") |