Mercurial > hg > minc-tools

changeset 2583:da1ba6dfb580

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixing CMakeLists.txt
author Vladimir Fonov <vladimir.fonov@gmail.com>
date Thu, 19 Jan 2012 11:57:07 +0800
parents 39e0adca1e8b
children f139eafe48ce 36848f798715
files CMakeLists.txt MINC2Config.cmake.in conversion/CMakeLists.txt ezminc/CMakeLists.txt minc4itk/CMakeLists.txt minc4itk/examples/CMakeLists.txt progs/CMakeLists.txt testdir/CMakeLists.txt
diffstat 8 files changed, 29 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,16 +229,16 @@
    libsrc2/volume.c
    )
 
-SET(MINC_LIBRARY minc)
-SET(MINC_LIBS ${MINC_LIBRARY} ${NETCDF_LIBRARY})
+SET(MINC2_LIBRARY minc)
+SET(MINC2_LIBRARIES ${MINC2_LIBRARY} ${NETCDF_LIBRARY})
 
 IF(BUILD_MINC2)
   INCLUDE_DIRECTORIES( ${HDF5_INCLUDE_DIR} )
 
 
   SET(minc_LIB_SRCS ${minc1_LIB_SRCS} ${minc2_LIB_SRCS})
-  SET(MINC_LIBRARY minc2)
-  SET(MINC_LIBS ${MINC_LIBRARY} ${NETCDF_LIBRARY} ${HDF5_LIBRARY} ${ZLIB_LIBRARIES} m )
+  SET(MINC2_LIBRARY minc2)
+  SET(MINC2_LIBRARIES ${MINC2_LIBRARY} ${HDF5_LIBRARY} ${NETCDF_LIBRARY} ${ZLIB_LIBRARIES}  m )
 
   ADD_LIBRARY(minc2 STATIC ${minc_LIB_SRCS} )
 
@@ -260,7 +260,7 @@
   SET_TARGET_PROPERTIES(minc2 PROPERTIES VERSION ${PACKAGE_VERSION} SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR})
 
   IF(NOT USE_SYSTEM_HDF5)
-      ADD_DEPENDENCIES(${MINC_LIBRARY} HDF5)
+      ADD_DEPENDENCIES(${MINC2_LIBRARY} HDF5)
   ENDIF(NOT USE_SYSTEM_HDF5)
 
 ELSE(BUILD_MINC2)
@@ -284,7 +284,7 @@
 ENDIF(BUILD_MINC2)
 
 IF(NOT USE_SYSTEM_NETCDF)
-    ADD_DEPENDENCIES(${MINC_LIBRARY} NETCDF)
+    ADD_DEPENDENCIES(${MINC2_LIBRARY} NETCDF)
 ENDIF(NOT USE_SYSTEM_NETCDF)
 
 
@@ -333,15 +333,15 @@
   ADD_LIBRARY(volume_io2 STATIC ${volume_io_LIB_SRCS})
   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)
-  ADD_DEPENDENCIES(volume_io2 ${MINC_LIBRARY})
+  SET( VOLUME_IO_LIBRARY volume_io2)
+  ADD_DEPENDENCIES(volume_io2 ${MINC2_LIBRARY})
 
 ELSE(BUILD_MINC2)
   ADD_LIBRARY(volume_io STATIC ${volume_io_LIB_SRCS})
   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)
-  ADD_DEPENDENCIES(volume_io ${MINC_LIBRARY})
+  SET( VOLUME_IO_LIBRARY volume_io)
+  ADD_DEPENDENCIES(volume_io ${MINC2_LIBRARY})
 ENDIF(BUILD_MINC2)
 
 INSTALL(FILES volume_io/Include/volume_io/alloc.h
@@ -405,7 +405,7 @@
   ${CMAKE_CURRENT_BINARY_DIR}/UseMINC2.cmake @ONLY)
 
 # config for install dir
-set(MINC2_USE_FILE_CONFIG "${CMAKE_INSTALL_PREFIX}/lib/MINC2/UseMINC2.cmake")
+set(MINC2_USE_FILE_CONFIG "${CMAKE_INSTALL_PREFIX}/lib/UseMINC2.cmake")
 
 set(MINC2_INCLUDE_DIRS_CONFIG    
    ${CMAKE_INSTALL_PREFIX}/include
@@ -423,11 +423,6 @@
   DESTINATION lib
   COMPONENT Development)
 
-# install(FILES 
-#   cmake-modules/FindHDF5.cmake cmake-modules/FindNETCDF.cmake
-#   DESTINATION lib
-#   COMPONENT Development)
-
 # testing
 
 IF(BUILD_TESTING)
--- a/MINC2Config.cmake.in
+++ b/MINC2Config.cmake.in
@@ -12,4 +12,4 @@
 set(MINC2_INCLUDE_DIRS "@MINC2_INCLUDE_DIRS_CONFIG@")
 set(MINC2_LIBRARY_DIRS "@MINC2_LIBRARY_DIRS_CONFIG@")
 set(MINC2_USE_FILE     "@MINC2_USE_FILE_CONFIG@")
-set(MINC2_LIBRARIES    "@MINC_LIBS@")
+set(MINC2_LIBRARIES    "@MINC2_LIBRARIES@")
--- a/conversion/CMakeLists.txt
+++ b/conversion/CMakeLists.txt
@@ -3,7 +3,7 @@
 # Andrew Janke - a.janke@gmail.com
 
 #LINK_DIRECTORIES()
-LINK_LIBRARIES( ${MINC_LIBS} m)
+LINK_LIBRARIES( ${MINC2_LIBRARIES} m)
 
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
@@ -43,7 +43,7 @@
    minctoecat/machine_indep.c
    )
 
-TARGET_LINK_LIBRARIES(minctoecat ${VOLUME_IO_LIB} ${MINC_LIBS} m)
+TARGET_LINK_LIBRARIES(minctoecat ${VOLUME_IO_LIBRARY} ${MINC2_LIBRARIES} m)
 
 
 ADD_EXECUTABLE(mnc2nii
@@ -51,14 +51,14 @@
    nifti1/nifti1_io.c
    nifti1/znzlib.c
    )
-TARGET_LINK_LIBRARIES(mnc2nii ${VOLUME_IO_LIB} ${MINC_LIBS} m)
+TARGET_LINK_LIBRARIES(mnc2nii ${VOLUME_IO_LIBRARY} ${MINC2_LIBRARIES} m)
 
 ADD_EXECUTABLE(nii2mnc
    nifti1/nii2mnc.c
    nifti1/nifti1_io.c
    nifti1/znzlib.c
    )
-TARGET_LINK_LIBRARIES(nii2mnc ${VOLUME_IO_LIB} ${MINC_LIBS} m)
+TARGET_LINK_LIBRARIES(nii2mnc ${VOLUME_IO_LIBRARY} ${MINC2_LIBRARIES} m)
 
 ADD_EXECUTABLE(upet2mnc
    micropet/upet2mnc.c
--- a/ezminc/CMakeLists.txt
+++ b/ezminc/CMakeLists.txt
@@ -22,7 +22,7 @@
 
 
 ADD_LIBRARY( minc_io ${MINC_IO_HEADERS} ${MINC_IO_SRC})
-TARGET_LINK_LIBRARIES(minc_io ${MINC_LIBS})
+TARGET_LINK_LIBRARIES(minc_io ${MINC2_LIBRARIES})
 
 INSTALL(TARGETS minc_io ARCHIVE DESTINATION lib)
 INSTALL(FILES  ${MINC_IO_HEADERS} DESTINATION include)
--- a/minc4itk/CMakeLists.txt
+++ b/minc4itk/CMakeLists.txt
@@ -38,8 +38,8 @@
     ${ITK_LIBRARIES}
     itkvnl_algo 
     itkvnl 
-    ${MINC_LIBS}
-    ${VOLUME_IO_LIB}
+    ${VOLUME_IO_LIBRARY}
+    ${MINC2_LIBRARIES}
     m 
     z )
 
--- a/minc4itk/examples/CMakeLists.txt
+++ b/minc4itk/examples/CMakeLists.txt
@@ -1,8 +1,6 @@
 LINK_LIBRARIES( minc4itk )
 
 
-
-
 ADD_EXECUTABLE(itk_convert itk_convert.cpp)
 ADD_EXECUTABLE(itk_distance itk_distance.cpp)
 ADD_EXECUTABLE(itk_dti itk_dti.cpp)
--- a/progs/CMakeLists.txt
+++ b/progs/CMakeLists.txt
@@ -7,7 +7,7 @@
 #LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/..)
 INCLUDE_DIRECTORIES(Proglib)
 
-LINK_LIBRARIES( ${MINC_LIBS} )
+LINK_LIBRARIES( ${MINC2_LIBRARIES} )
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
 #SET(BISON_FIND_REQUIRED)
@@ -48,7 +48,6 @@
   include_directories(${CMAKE_CURRENT_BINARY_DIR} mincgen)
   BISON_TARGET(ncgentab ${CMAKE_CURRENT_SOURCE_DIR}/mincgen/ncgentab.y ${CMAKE_CURRENT_BINARY_DIR}/ncgentab.c)
   FLEX_TARGET(ncgenyy ${CMAKE_CURRENT_SOURCE_DIR}/mincgen/ncgenyy.l ${CMAKE_CURRENT_BINARY_DIR}/ncgenyy.c)
-  #ADD_FLEX_BISON_DEPENDENCY(ncgenyy ncgentab)
 
   ADD_EXECUTABLE(mincgen mincgen/main.c
                             ${BISON_ncgentab_OUTPUTS}
@@ -92,7 +91,7 @@
 ADD_EXECUTABLE(mincresample mincresample/mincresample.c
                                mincresample/resample_volumes.c
                                Proglib/convert_origin_to_start.c)
-TARGET_LINK_LIBRARIES(mincresample ${VOLUME_IO_LIB} ${MINC_LIBS} m)
+TARGET_LINK_LIBRARIES(mincresample ${VOLUME_IO_LIBRARY} ${MINC2_LIBRARIES} m)
 
 ADD_EXECUTABLE(mincreshape mincreshape/mincreshape.c
                               mincreshape/copy_data.c)
@@ -109,20 +108,20 @@
 
 
 ADD_EXECUTABLE(voxeltoworld coordinates/voxeltoworld.c)
-TARGET_LINK_LIBRARIES(voxeltoworld ${VOLUME_IO_LIB} ${MINC_LIBS} m)
+TARGET_LINK_LIBRARIES(voxeltoworld ${VOLUME_IO_LIBRARY} ${MINC2_LIBRARIES} m)
 
 ADD_EXECUTABLE(worldtovoxel coordinates/worldtovoxel.c)
-TARGET_LINK_LIBRARIES(worldtovoxel ${VOLUME_IO_LIB} ${MINC_LIBS} m)
+TARGET_LINK_LIBRARIES(worldtovoxel ${VOLUME_IO_LIBRARY} ${MINC2_LIBRARIES} m)
 
 
 ADD_EXECUTABLE(transformtags xfm/transformtags.c)
-TARGET_LINK_LIBRARIES(transformtags ${VOLUME_IO_LIB} ${MINC_LIBS} m)
+TARGET_LINK_LIBRARIES(transformtags ${VOLUME_IO_LIBRARY} ${MINC2_LIBRARIES} m)
 
 ADD_EXECUTABLE(xfmconcat xfm/xfmconcat.c)
-TARGET_LINK_LIBRARIES(xfmconcat ${VOLUME_IO_LIB} ${MINC_LIBS} m)
+TARGET_LINK_LIBRARIES(xfmconcat ${VOLUME_IO_LIBRARY} ${MINC2_LIBRARIES} m)
 
 ADD_EXECUTABLE(xfminvert xfm/xfminvert.c)
-TARGET_LINK_LIBRARIES(xfminvert ${VOLUME_IO_LIB} ${MINC_LIBS} m)
+TARGET_LINK_LIBRARIES(xfminvert ${VOLUME_IO_LIBRARY} ${MINC2_LIBRARIES} m)
 
 # install progs
 INSTALL(TARGETS
--- a/testdir/CMakeLists.txt
+++ b/testdir/CMakeLists.txt
@@ -1,5 +1,5 @@
 
-LINK_LIBRARIES( ${MINC_LIBS} )
+LINK_LIBRARIES(${MINC2_LIBRARIES})
 
 ADD_EXECUTABLE(minc_tst minc.c)
 ADD_EXECUTABLE(icv icv.c)
@@ -16,7 +16,7 @@
 ADD_EXECUTABLE(test_xfm test_xfm.c)
 
 ADD_EXECUTABLE(create_grid_xfm create_grid_xfm.c)
-TARGET_LINK_LIBRARIES(create_grid_xfm ${VOLUME_IO_LIB} ${MINC_LIBS} m)
+TARGET_LINK_LIBRARIES(create_grid_xfm ${VOLUME_IO_LIBRARY} ${MINC2_LIBRARIES} m)
 
 MACRO(minc_test cmd)
   # minc 1 version
@@ -51,4 +51,4 @@
 #add_test(test_speed test_speed)
 #add_test(test_xfm test_xfm)
 
-TARGET_LINK_LIBRARIES(test_xfm ${VOLUME_IO_LIB} ${MINC_LIBS} m)
+TARGET_LINK_LIBRARIES(test_xfm ${VOLUME_IO_LIBRARY} ${MINC2_LIBRARIES} m)