Hi Mathieu,
On Tue, Sep 30, 2008 at 09:24:50AM +0200, Mathieu Malaterre wrote:
> >> > It's a bit unusual to have the version number embedded in tool names
> >> > (e.g. gdcmconv-2.0).
> >> > My inclination is to drop the versioned names.
> >> > Mathieu: do you have any objection to this?
> >>
> >> sure. How do you want the patch, I am not familiar with quilt and co.
I just checked in the changes to remove the version number suffix.
> > You can send me a simple patch and I'll put it into quilt form.
>
>
> somehow this patch needs to be applied to the toplevel CMakeLists.txt:
>
> https://gdcm.svn.sf.net/viewvc/gdcm/trunk/CMakeLists.txt?r1=4424&r2=4438&view=patch
That wasn't sufficient. I had to modify two other CMakeLists files.
Patch below.
-Steve
--- gdcm-2.0.9.orig/CMakeLists.txt
+++ gdcm-2.0.9/CMakeLists.txt
@@ -54,6 +54,10 @@
VERSION "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}"
)
+IF(GDCM_NO_EXECUTABLE_PROPERTIES)
+ SET(GDCM_EXECUTABLE_PROPERTIES)
+ENDIF(GDCM_NO_EXECUTABLE_PROPERTIES)
+
#-----------------------------------------------------------------------------
INCLUDE(${GDCM_SOURCE_DIR}/CMake/UseCopyright.cmake)
CREATE_COPYRIGHT_FILE(${CMAKE_CURRENT_BINARY_DIR}/Copyright.txt)
--- gdcm-2.0.9.orig/Applications/Cxx/CMakeLists.txt
+++ gdcm-2.0.9/Applications/Cxx/CMakeLists.txt
@@ -48,7 +48,9 @@
ADD_EXECUTABLE(${exename} ${exename}.cxx)
ENDIF(${exename} STREQUAL "gdcminfo")
TARGET_LINK_LIBRARIES(${exename} gdcmMSFF)
- SET_TARGET_PROPERTIES(${exename} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES})
+ IF(GDCM_EXECUTABLE_PROPERTIES)
+ SET_TARGET_PROPERTIES(${exename} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES})
+ ENDIF(GDCM_EXECUTABLE_PROPERTIES)
IF(WIN32 AND NOT CYGWIN)
TARGET_LINK_LIBRARIES(${exename} gdcmgetopt)
ENDIF(WIN32 AND NOT CYGWIN)
--- gdcm-2.0.9.orig/Utilities/VTK/Applications/CMakeLists.txt
+++ gdcm-2.0.9/Utilities/VTK/Applications/CMakeLists.txt
@@ -17,7 +17,9 @@
FOREACH(app ${GDCM_VTK_APPS})
ADD_EXECUTABLE(${app} ${app}.cxx)
- SET_TARGET_PROPERTIES(${app} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES})
+ IF(GDCM_EXECUTABLE_PROPERTIES)
+ SET_TARGET_PROPERTIES(${app} PROPERTIES ${GDCM_EXECUTABLE_PROPERTIES})
+ ENDIF(GDCM_EXECUTABLE_PROPERTIES)
TARGET_LINK_LIBRARIES(${app} vtkgdcm vtkRendering)
IF( "${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}" GREATER 5.0 )
TARGET_LINK_LIBRARIES(${app} vtkgdcm vtkWidgets)
Attachment:
signature.asc
Description: Digital signature