Mercurial > hg > minc-tools

changeset 2591:7980090d445e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
making minc1 only compilation work
author Vladimir Fonov <vladimir.fonov@gmail.com>
date Wed, 18 Jan 2012 03:56:02 -0500
parents 4089d520ca08
children b25a2deca01c
files conversion/CMakeLists.txt conversion/nifti1/mnc2nii.c progs/CMakeLists.txt testdir/CMakeLists.txt
diffstat 4 files changed, 36 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/conversion/CMakeLists.txt
+++ b/conversion/CMakeLists.txt
@@ -3,11 +3,7 @@
 # Andrew Janke - a.janke@gmail.com
 
 #LINK_DIRECTORIES()
-IF(BUILD_MINC2)
-  LINK_LIBRARIES( minc2 ${NETCDF_LIBRARY} ${HDF5_LIBRARY} )
-ELSE(BUILD_MINC2)
-  LINK_LIBRARIES( minc ${NETCDF_LIBRARY} )
-ENDIF(BUILD_MINC2)
+LINK_LIBRARIES( ${MINC_LIBS} m)
 
 ADD_DEFINITIONS(-DHAVE_CONFIG_H)
 
@@ -47,11 +43,7 @@
    minctoecat/machine_indep.c
    )
 
-IF(BUILD_MINC2)
-  TARGET_LINK_LIBRARIES(minctoecat volume_io2 minc2)
-ELSE(BUILD_MINC2)
-  TARGET_LINK_LIBRARIES(minctoecat volume_io minc)
-ENDIF(BUILD_MINC2)
+TARGET_LINK_LIBRARIES(minctoecat ${VOLUME_IO_LIB} ${MINC_LIBS} m)
 
 
 ADD_EXECUTABLE(mnc2nii
@@ -59,25 +51,29 @@
    nifti1/nifti1_io.c
    nifti1/znzlib.c
    )
+TARGET_LINK_LIBRARIES(mnc2nii ${VOLUME_IO_LIB} ${MINC_LIBS} m)
+
 ADD_EXECUTABLE(nii2mnc
    nifti1/nii2mnc.c
    nifti1/nifti1_io.c
    nifti1/znzlib.c
    )
-
-IF(BUILD_MINC2)
-  TARGET_LINK_LIBRARIES(nii2mnc volume_io2 minc2)
-ELSE(BUILD_MINC2)
-  TARGET_LINK_LIBRARIES(nii2mnc volume_io minc)
-ENDIF(BUILD_MINC2)
+TARGET_LINK_LIBRARIES(nii2mnc ${VOLUME_IO_LIB} ${MINC_LIBS} m)
 
 ADD_EXECUTABLE(upet2mnc
    micropet/upet2mnc.c
    )
 
+IF(BUILD_MINC2)
+
 ADD_EXECUTABLE(vff2mnc
    vff2mnc/vff2mnc.c
    )
+INSTALL(TARGETS
+   vff2mnc
+   DESTINATION bin)
+
+ENDIF(BUILD_MINC2)
 
 
 # install progs
@@ -88,5 +84,4 @@
    mnc2nii
    nii2mnc
    upet2mnc
-   vff2mnc
    DESTINATION bin)
--- a/conversion/nifti1/mnc2nii.c
+++ b/conversion/nifti1/mnc2nii.c
@@ -2,7 +2,7 @@
 #include "config.h"
 #endif
 
-#include <minc2.h>
+#include <minc.h>
 #include <ParseArgv.h>
 
 #include "nifti1_io.h"
--- a/progs/CMakeLists.txt
+++ b/progs/CMakeLists.txt
@@ -19,6 +19,7 @@
 # all the progs
 ADD_EXECUTABLE(invert_raw_image mincview/invert_raw_image.c)
 ADD_EXECUTABLE(mincaverage mincaverage/mincaverage.c)
+TARGET_LINK_LIBRARIES(mincaverage m)
 
 IF(BISON_FOUND AND FLEX_FOUND)
   include_directories(${CMAKE_CURRENT_BINARY_DIR} minccalc)
@@ -40,7 +41,7 @@
                   ${BISON_gram_OUTPUTS}
                  )
 
-  TARGET_LINK_LIBRARIES(minccalc ${FLEX_LIBRARIES})
+  TARGET_LINK_LIBRARIES(minccalc ${FLEX_LIBRARIES} m)
 
   INSTALL( TARGETS minccalc  DESTINATION bin)
 
@@ -77,41 +78,51 @@
 ADD_EXECUTABLE(mincextract mincextract/mincextract.c)
 ADD_EXECUTABLE(mincinfo mincinfo/mincinfo.c)
 ADD_EXECUTABLE(minclookup minclookup/minclookup.c)
+TARGET_LINK_LIBRARIES(minclookup m)
+
 ADD_EXECUTABLE(mincmakescalar mincmakescalar/mincmakescalar.c)
+TARGET_LINK_LIBRARIES(mincmakescalar m)
+
 ADD_EXECUTABLE(mincmakevector mincmakevector/mincmakevector.c)
 ADD_EXECUTABLE(mincmath mincmath/mincmath.c)
+TARGET_LINK_LIBRARIES(mincmath m)
+
 ADD_EXECUTABLE(minc_modify_header minc_modify_header/minc_modify_header.c)
 
 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})
+TARGET_LINK_LIBRARIES(mincresample ${VOLUME_IO_LIB} ${MINC_LIBS} m)
 
 ADD_EXECUTABLE(mincreshape mincreshape/mincreshape.c
                               mincreshape/copy_data.c)
 
 ADD_EXECUTABLE(mincstats mincstats/mincstats.c)
+TARGET_LINK_LIBRARIES(mincstats m)
+
 ADD_EXECUTABLE(minctoraw minctoraw/minctoraw.c)
 ADD_EXECUTABLE(mincwindow mincwindow/mincwindow.c)
 
 ADD_EXECUTABLE(rawtominc rawtominc/rawtominc.c
                             Proglib/convert_origin_to_start.c)
+TARGET_LINK_LIBRARIES(rawtominc m)
+
 
 ADD_EXECUTABLE(voxeltoworld coordinates/voxeltoworld.c)
-TARGET_LINK_LIBRARIES(voxeltoworld ${VOLUME_IO_LIB} ${MINC_LIBS})
+TARGET_LINK_LIBRARIES(voxeltoworld ${VOLUME_IO_LIB} ${MINC_LIBS} m)
 
 ADD_EXECUTABLE(worldtovoxel coordinates/worldtovoxel.c)
-TARGET_LINK_LIBRARIES(worldtovoxel ${VOLUME_IO_LIB} ${MINC_LIBS})
+TARGET_LINK_LIBRARIES(worldtovoxel ${VOLUME_IO_LIB} ${MINC_LIBS} m)
 
 
 ADD_EXECUTABLE(transformtags xfm/transformtags.c)
-TARGET_LINK_LIBRARIES(transformtags ${VOLUME_IO_LIB} ${MINC_LIBS})
+TARGET_LINK_LIBRARIES(transformtags ${VOLUME_IO_LIB} ${MINC_LIBS} m)
 
 ADD_EXECUTABLE(xfmconcat xfm/xfmconcat.c)
-TARGET_LINK_LIBRARIES(xfmconcat ${VOLUME_IO_LIB} ${MINC_LIBS})
+TARGET_LINK_LIBRARIES(xfmconcat ${VOLUME_IO_LIB} ${MINC_LIBS} m)
 
 ADD_EXECUTABLE(xfminvert xfm/xfminvert.c)
-TARGET_LINK_LIBRARIES(xfminvert ${VOLUME_IO_LIB} ${MINC_LIBS})
+TARGET_LINK_LIBRARIES(xfminvert ${VOLUME_IO_LIB} ${MINC_LIBS} m)
 
 # install progs
 INSTALL(TARGETS
--- a/testdir/CMakeLists.txt
+++ b/testdir/CMakeLists.txt
@@ -16,13 +16,16 @@
 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})
+TARGET_LINK_LIBRARIES(create_grid_xfm ${VOLUME_IO_LIB} ${MINC_LIBS} m)
 
 MACRO(minc_test cmd)
   # minc 1 version
   add_test(${cmd}-1 ${CMAKE_CURRENT_SOURCE_DIR}/run_test_cmake.sh ${CMAKE_CURRENT_BINARY_DIR}/${cmd} ${CMAKE_CURRENT_SOURCE_DIR}/${cmd}.out)
+  IF(BUILD_MINC2)
   # minc 2 version
   add_test(${cmd}-2 ${CMAKE_CURRENT_SOURCE_DIR}/run_test2_cmake.sh ${CMAKE_CURRENT_BINARY_DIR}/${cmd} ${CMAKE_CURRENT_SOURCE_DIR}/${cmd}.out)
+  ENDIF(BUILD_MINC2)
+
 ENDMACRO(minc_test)
 
 
@@ -48,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})
+TARGET_LINK_LIBRARIES(test_xfm ${VOLUME_IO_LIB} ${MINC_LIBS} m)