Mercurial > hg > minc-tools

changeset 2553:0b52afea4248

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integrated ezminc building....
author Vladimir S. FONOV <vladimir.fonov@gmail.com>
date Thu, 08 Dec 2011 18:51:19 -0500
parents 345f8c960657
children f13ced4f31ae
files CMakeLists.txt ezminc/CMakeLists.txt
diffstat 2 files changed, 7 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -120,7 +120,7 @@
 
   TARGET_LINK_LIBRARIES(minc2 ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${ZLIB_LIBRARIES} m )
 
-  INSTALL(TARGETS minc2 DESTINATION lib)
+  INSTALL(TARGETS minc2 ARCHIVE DESTINATION lib)
 
   INSTALL(FILES libsrc/minc.h libsrc/ParseArgv.h 
     libsrc/voxel_loop.h 
@@ -141,7 +141,7 @@
     SET(minc_LIB minc)
     ADD_LIBRARY(minc STATIC ${minc1_LIB_SRCS} )
     TARGET_LINK_LIBRARIES(minc ${NETCDF_LIBRARY} )
-    INSTALL(TARGETS minc DESTINATION lib)
+    INSTALL(TARGETS minc ARCHIVE DESTINATION lib)
 
     INSTALL(FILES libsrc/minc.h libsrc/ParseArgv.h 
       libsrc/voxel_loop.h 
@@ -200,13 +200,13 @@
 IF(BUILD_MINC2)
   # build and install volume_io2 library
   ADD_LIBRARY(volume_io2 STATIC ${volume_io_LIB_SRCS})
-  INSTALL(TARGETS volume_io2 DESTINATION lib)
+  INSTALL(TARGETS volume_io2 ARCHIVE DESTINATION lib)
   SET_TARGET_PROPERTIES(volume_io2 PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
   SET( volume_io_LIB volume_io2)
 
 ELSE(BUILD_MINC2)
   ADD_LIBRARY(volume_io STATIC ${volume_io_LIB_SRCS})
-  INSTALL(TARGETS volume_io DESTINATION lib)
+  INSTALL(TARGETS volume_io ARCHIVE DESTINATION lib)
   SET_TARGET_PROPERTIES(volume_io PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
   SET( volume_io_LIB volume_io)
 ENDIF(BUILD_MINC2)
@@ -241,4 +241,4 @@
 
 IF(BUILD_EZMINC)
 ADD_SUBDIRECTORY( ezminc )
-ENDIF(BUILD_EZMINC)
\ No newline at end of file
+ENDIF(BUILD_EZMINC)
--- a/ezminc/CMakeLists.txt
+++ b/ezminc/CMakeLists.txt
@@ -1,20 +1,7 @@
-LINK_LIBRARIES(
-    m 
-    z )
 
-IF(USE_MINC2)
+IF(BUILD_MINC2)
   ADD_DEFINITIONS( -DMINC2 )
-  LINK_LIBRARIES(volume_io2 minc2 netcdf hdf5 z)
-ELSE(USE_MINC2)
-  LINK_LIBRARIES(volume_io minc netcdf)
-ENDIF(USE_MINC2)
-
-
-INCLUDE_DIRECTORIES( 
-  ${VOLUME_TOOLS_BINARY_DIR}
-  ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_CURRENT_SOURCE_DIR}
-)
+ENDIF(BUILD_MINC2)
 
 
 SET( MINC_IO_HEADERS 
@@ -34,6 +21,5 @@
 
 ADD_LIBRARY( minc_io ${MINC_IO_HEADERS} ${MINC_IO_SRC})
 
-
 INSTALL(TARGETS minc_io ARCHIVE DESTINATION lib)
 INSTALL(FILES  ${MINC_IO_HEADERS} DESTINATION include)