[Debian-med-packaging] [SCM] via branch, master, updated. upstream/1.6.0-72-gf8873e3

[Michael Hanke]

The following commit has been merged in the master branch:
commit 9001fb4cd45fb8fc1a79956a9af7f521ee42588c
Author: Michael Hanke <michael.hanke at gmail.com>
Date:   Tue Apr 6 10:04:08 2010 -0400

    Revert up/cmake branch (now in quilt).

diff --git a/base/pngtov/CMakeLists.txt b/base/pngtov/CMakeLists.txt
index 79647ae..9bc2909 100644
--- a/base/pngtov/CMakeLists.txt
+++ b/base/pngtov/CMakeLists.txt
@@ -1,11 +1,7 @@
 PROJECT(PNGTOV)
 
-FIND_PACKAGE(PNG REQUIRED)
-INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR})
-ADD_DEFINITIONS(${PNG_DEFINITIONS})
-
 ADD_EXECUTABLE(pngtov pngtov.c)
-TARGET_LINK_LIBRARIES(pngtov via ${PNG_LIBRARY})
+TARGET_LINK_LIBRARIES(pngtov via png)
 
 INSTALL(TARGETS pngtov
         RUNTIME DESTINATION ${VIA_INSTALL_BIN_DIR}
diff --git a/vxlib/CMakeLists.txt b/vxlib/CMakeLists.txt
index 0a8d05f..dc7c669 100644
--- a/vxlib/CMakeLists.txt
+++ b/vxlib/CMakeLists.txt
@@ -15,7 +15,7 @@ ADD_LIBRARY(vx_static STATIC ${VXLIB_SRC})
 #The library target "vx_static" has a default OUTPUT_NAME of "vx_static", can be changed with
 SET_TARGET_PROPERTIES(vx_static PROPERTIES ${VIA_LIBRARY_PROPERTIES} OUTPUT_NAME "vx")
 
-TARGET_LINK_LIBRARIES(vx m viaio ${MOTIF_LIBRARIES} ${X11_Xt_LIB} ${X11_LIBRARIES} ${LIB_XMU} Xt)
+TARGET_LINK_LIBRARIES(vx m viaio ${MOTIF_LIBRARIES} ${X11_Xt_LIB} ${X11_LIBRARIES} ${LIB_XMU})
 # MESSAGE(STATUS )
 
 # install library

-- 
VIA - library for Volumetric Image Analysis