Commit a8757db5 authored by saubatn's avatar saubatn
Browse files

FIXED : tentative to fix Windows packaging issues. Added ITK dependency for...

FIXED : tentative to fix Windows packaging issues. Added ITK dependency for packaging (required by component DICOM).

git-svn-id: svn+ssh://scm.forge.imag.fr/var/lib/gforge/chroot/scmrepos/svn/camitk/trunk/camitk@367 ec899d31-69d1-42ba-9299-647d76f65fb3
parent 127c4d8c
......@@ -199,6 +199,7 @@ if(WIN32 AND NOT UNIX)
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS
##TODO use GetPrerequisites.cmake (i.e. find a better way to list dependencies)
##get_prerequisites() is not well enough documented to justify the time investement - EP May 2011
# Qt dependencies
${QT_BINARY_DIR}/QtCore4.dll
${QT_BINARY_DIR}/QtGui4.dll
${QT_BINARY_DIR}/QtSvg4.dll
......@@ -206,6 +207,7 @@ if(WIN32 AND NOT UNIX)
${QT_BINARY_DIR}/QtNetwork4.dll
${QT_BINARY_DIR}/QtSql4.dll
${QT_BINARY_DIR}/QtWebKit4.dll
# VTK dependencies
${VTK_LIBRARY_DIRS}/libQVTK.dll
${VTK_LIBRARY_DIRS}/libvtkCommon.dll
${VTK_LIBRARY_DIRS}/libvtksys.dll
......@@ -220,7 +222,6 @@ if(WIN32 AND NOT UNIX)
${VTK_LIBRARY_DIRS}/libvtkDICOMParser.dll
${VTK_LIBRARY_DIRS}/libvtkNetCDF.dll
${VTK_LIBRARY_DIRS}/libvtkNetCDF_cxx.dll
# ${VTK_LIBRARY_DIRS}/Release/vtkmesh.dll
${VTK_LIBRARY_DIRS}/libvtkexpat.dll
${VTK_LIBRARY_DIRS}/libvtkjpeg.dll
${VTK_LIBRARY_DIRS}/libvtkmetaio.dll
......@@ -228,29 +229,26 @@ if(WIN32 AND NOT UNIX)
${VTK_LIBRARY_DIRS}/libvtktiff.dll
${VTK_LIBRARY_DIRS}/libvtkzlib.dll
${VTK_LIBRARY_DIRS}/libvtkInfovis.dll
# ${VTK_LIBRARY_DIRS}/Release/vtkQtChart.dll
${VTK_LIBRARY_DIRS}/libvtkfreetype.dll
${VTK_LIBRARY_DIRS}/libvtkftgl.dll
${VTK_LIBRARY_DIRS}/libvtkalglib.dll
${VTK_LIBRARY_DIRS}/libvtklibxml2.dll
${VTK_LIBRARY_DIRS}/libvtkViews.dll
${VTK_LIBRARY_DIRS}/libvtkexoIIc.dll
${VTK_LIBRARY_DIRS}/libvtkWidgets.dll
# Wizard dependencies
# ${XERCESC_ROOT_DIR}/bin/xerces-c_3_1.dll WARNING, use if you decide to package wizard, but sometimes, at packaging run-time XERCESC_ROOT_DIR is null.
${VTK_LIBRARY_DIRS}/libvtkWidgets.dll
${VTK_LIBRARY_DIRS}/libvtkhdf5.dll
${VTK_LIBRARY_DIRS}/libvtkhdf5_hl.dll
${VTK_LIBRARY_DIRS}/libLSDyna.dll
# Xerces-c dependency
${XERCESC_ROOT_DIR}/bin/xerces-c_3_1.dll
# Libxml2 dependencies
${LIBXML2_INCLUDE_DIR}/../bin/iconv.dll
${LIBXML2_INCLUDE_DIR}/../bin/libxml2.dll
${LIBXML2_INCLUDE_DIR}/../bin/zlib1.dll
# ITK dependency
${ITK_DIR}/../../bin/libITKCommon.dll
)
##ITK is required
# FIND_PACKAGE(ITK)
if (${ITK_FOUND})
message(pass ${VTK_LIBRARY_DIRS})
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} ${ITK_DIR}/bin/libITKCommon.dll)
endif ()
endif()
# MSVC compiler
......@@ -261,6 +259,7 @@ if(WIN32 AND NOT UNIX)
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS
##TODO use GetPrerequisites.cmake (i.e. find a better way to list dependencies)
##get_prerequisites() is not well enough documented to justify the time investement - EP May 2011
# Qt dependencies
${QT_BINARY_DIR}/QtCore4.dll
${QT_BINARY_DIR}/QtGui4.dll
${QT_BINARY_DIR}/QtSvg4.dll
......@@ -268,6 +267,7 @@ if(WIN32 AND NOT UNIX)
${QT_BINARY_DIR}/QtNetwork4.dll
${QT_BINARY_DIR}/QtSql4.dll
${QT_BINARY_DIR}/QtWebKit4.dll
# VTK dependencies
${VTK_LIBRARY_DIRS}/Release/QVTK.dll
${VTK_LIBRARY_DIRS}/Release/vtkCommon.dll
${VTK_LIBRARY_DIRS}/Release/vtksys.dll
......@@ -282,7 +282,6 @@ if(WIN32 AND NOT UNIX)
${VTK_LIBRARY_DIRS}/Release/vtkDICOMParser.dll
${VTK_LIBRARY_DIRS}/Release/vtkNetCDF.dll
${VTK_LIBRARY_DIRS}/Release/vtkNetCDF_cxx.dll
# ${VTK_LIBRARY_DIRS}/Release/vtkmesh.dll
${VTK_LIBRARY_DIRS}/Release/vtkexpat.dll
${VTK_LIBRARY_DIRS}/Release/vtkjpeg.dll
${VTK_LIBRARY_DIRS}/Release/vtkmetaio.dll
......@@ -290,7 +289,6 @@ if(WIN32 AND NOT UNIX)
${VTK_LIBRARY_DIRS}/Release/vtktiff.dll
${VTK_LIBRARY_DIRS}/Release/vtkzlib.dll
${VTK_LIBRARY_DIRS}/Release/vtkInfovis.dll
# ${VTK_LIBRARY_DIRS}/Release/vtkQtChart.dll
${VTK_LIBRARY_DIRS}/Release/vtkfreetype.dll
${VTK_LIBRARY_DIRS}/Release/vtkftgl.dll
${VTK_LIBRARY_DIRS}/Release/vtkalglib.dll
......@@ -298,21 +296,19 @@ if(WIN32 AND NOT UNIX)
${VTK_LIBRARY_DIRS}/Release/vtkViews.dll
${VTK_LIBRARY_DIRS}/Release/vtkexoIIc.dll
${VTK_LIBRARY_DIRS}/Release/vtkWidgets.dll
# Wizard dependencies
# ${XERCESC_ROOT_DIR}/bin/xerces-c_3_1.dll WARNING, use if you decide to package wizard, but sometimes, at packaging run-time XERCESC_ROOT_DIR is null.
${VTK_LIBRARY_DIRS}/Release/vtkhdf5.dll
${VTK_LIBRARY_DIRS}/Release/vtkhdf5_hl.dll
${VTK_LIBRARY_DIRS}/Release/LSDyna.dll
# Xerces-c dependency
${XERCESC_ROOT_DIR}/bin/xerces-c_3_1.dll
# Libxml2 dependencies
${LIBXML2_INCLUDE_DIR}/../bin/iconv.dll
${LIBXML2_INCLUDE_DIR}/../bin/libxml2.dll
${LIBXML2_INCLUDE_DIR}/../bin/zlib1.dll
# ITK dependency
${ITK_DIR}/../../bin/ITKCommon.dll
)
##ITK is required
# FIND_PACKAGE(ITK)
if (${ITK_FOUND})
message(pass ${VTK_LIBRARY_DIRS})
set(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} ${ITK_DIR}/bin/Release/ITKCommon.dll)
endif ()
endif()
......@@ -323,7 +319,7 @@ if(WIN32 AND NOT UNIX)
set(CPACK_NSIS_MUI_UNIICON ${CAMITK_PACKAGE_ICON}) #icon for the generated uninstall program (the .exe to run to uninstall CamiTK).
# Create desktop icons, by forcing CPack to build an internal command, as 'set(CPACK_NSIS_MODIFY_PATH ON)' option setted in the additional page doesn't work.
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "CreateShortCut \\\"$DESKTOP\\\\${CAMITK_PROJECT_NAME}-imp.lnk\\\" \\\"$INSTDIR\\\\bin\\\\imp.exe\\\"")
set(CPACK_NSIS_EXTRA_INSTALL_COMMANDS "CreateShortCut \\\"$DESKTOP\\\\${CAMITK_PROJECT_NAME}-imp.lnk\\\" \\\"$INSTDIR\\\\bin\\\\imp.exe\\\"")
# Tell CPack to remove the icons after uninstalling
set(CPACK_NSIS_EXTRA_UNINSTALL_COMMANDS "Delete \\\"$DESKTOP\\\\${CAMITK_PROJECT_NAME}-imp.lnk\\\"")
......@@ -336,7 +332,7 @@ if(WIN32 AND NOT UNIX)
set(CPACK_NSIS_HELP_LINK "http:\\\\\\\\camitk.imag.fr")
set(CPACK_NSIS_URL_INFO_ABOUT "http:\\\\\\\\camitk.imag.fr")
set(CPACK_NSIS_CONTACT ${CPACK_PACKAGE_CONTACT})
include(InstallRequiredSystemLibraries)
# include(InstallRequiredSystemLibraries)
else()
message(STATUS "Can not find makensis: nsis packaging is not possible")
endif()
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment