Commit 8ba8a58c authored by Emilie Harquel's avatar Emilie Harquel
Browse files

Updated CMakeLists to support new version of qt, vtk and itk.

--HG--
branch : fw4spl_0.10.0
parent 63119df6
......@@ -2,7 +2,7 @@ fwLoadProperties()
if(NOT EXISTS "${EXTERNAL_LIBRARIES}/lib/site-packages/")
message(SEND_ERROR "numpy is required for TutoPython and it is not found in : ${EXTERNAL_LIBRARIES}/lib/site-packages/ ")
message(WARNING "numpy is required for TutoPython and it is not found in : ${EXTERNAL_LIBRARIES}/lib/site-packages/ ")
else()
file(COPY "${EXTERNAL_LIBRARIES}/lib/site-packages/" DESTINATION "${CMAKE_BINARY_DIR}/Python/")
if(${NAME}_INSTALL)
......
......@@ -5,17 +5,15 @@ if(VRRender_INSTALL)
if(APPLE)
set(FWPROJECT_NAME VRRender)
set(VRRENDER_BUNDLE_ICON_FILE vrrender.icns)
set(VRRENDER_BUNDLE_ICON_FILE app.icns)
set_source_files_properties(rc/${VRRENDER_BUNDLE_ICON_FILE} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
add_executable(
VRRender.app MACOSX_BUNDLE
${launcher_HEADERS} ${launcher_SOURCES}
rc/${VRRENDER_BUNDLE_ICON_FILE}
)
set_target_properties( VRRender.app PROPERTIES OUTPUT_NAME ${FWPROJECT_NAME})
add_definitions(-DDEFAULT_PROFILE=Bundles/${FWPROJECT_NAME}_${${FWPROJECT_NAME}_DASH_VERSION}/profile.xml)
......@@ -25,7 +23,7 @@ if(VRRender_INSTALL)
set_target_properties( VRRender.app PROPERTIES MACOSX_BUNDLE_SHORT_VERSION_STRING "${${FWPROJECT_NAME}_VERSION}")
set_target_properties( VRRender.app PROPERTIES MACOSX_BUNDLE_LONG_VERSION_STRING "${${FWPROJECT_NAME}_VERSION}")
set_target_properties( VRRender.app PROPERTIES MACOSX_BUNDLE_BUNDLE_NAME "${FWPROJECT_NAME}")
set_target_properties( VRRender.app PROPERTIES MACOSX_BUNDLE_COPYRIGHT "Copyright 2012-2013 IRCAD")
set_target_properties( VRRender.app PROPERTIES MACOSX_BUNDLE_COPYRIGHT "Copyright 2012-2014 IRCAD")
set_target_properties( VRRender.app PROPERTIES MACOSX_BUNDLE_GUI_IDENTIFIER "com.ircad.vrrender")
find_package (Boost COMPONENTS filesystem program_options REQUIRED)
......@@ -35,7 +33,7 @@ if(VRRender_INSTALL)
set(APP_PATH "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/VRRender.app")
configure_file("${fwGuiQt_SOURCE_DIR}/bin/qt.conf" "${APP_PATH}/Contents/Resources/qt.conf")
configure_file("${fwGuiQt_DIR}/bin/qt.conf" "${APP_PATH}/Contents/Resources/qt.conf")
INSTALL(CODE " file(WRITE \"${APP_PATH}/Contents/Resources/qt.conf\" \"\") " COMPONENT ApplicationBundle)
install(
......@@ -47,20 +45,20 @@ if(VRRender_INSTALL)
install(DIRECTORY "${CMAKE_INSTALL_PREFIX}/share" DESTINATION "VRRender.app/Contents/" COMPONENT ApplicationBundle)
install(DIRECTORY "${CMAKE_INSTALL_PREFIX}/Bundles" DESTINATION "VRRender.app/Contents/" COMPONENT ApplicationBundle)
install(DIRECTORY "${CMAKE_INSTALL_PREFIX}/qtplugins/plugins" DESTINATION "VRRender.app/Contents/" COMPONENT ApplicationBundle)
install(DIRECTORY "${CMAKE_INSTALL_PREFIX}/qtplugins" DESTINATION "VRRender.app/Contents/" COMPONENT ApplicationBundle)
INSTALL(CODE "
file(GLOB_RECURSE QTPLUGINS \"${APP_INSTALL_PATH}/Contents/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
file(GLOB_RECURSE QTPLUGINS \"${APP_INSTALL_PATH}/Contents/qtplugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
file(GLOB_RECURSE BUNDLES \"${APP_INSTALL_PATH}/Contents/Bundles/*/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
include(BundleUtilities)
fixup_bundle(\"${APP_INSTALL_PATH}\" \"\${BUNDLES};\${QTPLUGINS}\" \"${CMAKE_INSTALL_PREFIX}/${LIBRARY_OUTPUT_DIR}\")
execute_process(
COMMAND sh -c \"find . -type f -exec stat --format='%s' {} \\; |sort -rn | uniq -d | xargs -I{} -n1 find . -type f -size {}c -print0 | xargs -0 stat --format='%20s %n' | sort | uniq -w20 --all-repeated=separate |cut -c22- | paste - - - -d' ' | sed 's/^/ln -s -f /' | sh \"
WORKING_DIRECTORY ${APP_INSTALL_PATH}/Contents/MacOS
COMMAND sh -c \"find . -type f -name '*.dylib'|sed 's/\\\\.[0-9].*//g'|sort|uniq -d|xargs -I{} -n1 find . -path '{}.*' | paste -d ' ' - -| sed 's/^/ln -s -f /' | sh \"
WORKING_DIRECTORY ${APP_INSTALL_PATH}/Contents/
)
execute_process(
COMMAND sh -c \"python ${CMAKE_SOURCE_DIR}/CMake/OSXTools/osx_install_name_tool.py -e MacOS/ $(find Bundles -iname '*.dylib') -f \"
COMMAND sh -c \"python ${CMAKE_SOURCE_DIR}/CMake/OSXTools/osx_install_name_tool.py -e MacOS/ $(find Bundles -iname '*.dylib') -f\"
WORKING_DIRECTORY ${APP_INSTALL_PATH}/Contents
)
......
#include <boost/filesystem/operations.hpp>
#include <fwAtomConversion/exception/DuplicatedDataUUID.hpp>
#include <fwTools/System.hpp>
......
fwLoadProperties()
fwUseForwardInclude(
fwRuntime
io
)
find_package (Boost REQUIRED)
fwForwardInclude(${Boost_INCLUDE_DIRS})
set( NAME ioGdcm )
set( VERSION 0.1 )
set( TYPE BUNDLE )
set( DEPENDENCIES fwComEd fwCore fwData fwGui fwMedData fwRuntime fwServices fwTools gdcmIO io )
set( REQUIREMENTS )
fwLoadProperties()
find_package (Boost REQUIRED)
find_package(CppUnit)
fwInclude(${Boost_INCLUDE_DIRS} ${CPPUNIT_INCLUDE_DIR})
fwLink(${Boost_LIBRARIES} ${CPPUNIT_LIBRARY})
set( NAME ioGdcmTest )
set( VERSION )
set( TYPE TEST )
set( DEPENDENCIES fwCore fwTest fwTools fwData fwDataTools fwMedData gdcmIO )
set( REQUIREMENTS dataReg servicesReg io ioGdcm )
set(CPPUNITTEST_OPTIONS BUNDLE ioGdcm)
......@@ -23,17 +23,8 @@ fwInclude(
${VNL_INCLUDE_PATH}
)
fwLink(
ITKCommon
ITKDICOMParser
ITKEXPAT
ITKIO
ITKMetaIO
ITKNrrdIO
ITKSpatialObject
ITKniftiio
ITKznz
itkjpeg8
itksys
ITKIOImageBase
ITKIOJPEG
${VNL_ALGO_LIBRARY}
${VNL_LIBRARY}
......
......@@ -5,6 +5,7 @@
* ****** END LICENSE BLOCK ****** */
#include <boost/assign/list_of.hpp>
#include <boost/filesystem/operations.hpp>
#include <fwTools/dateAndTime.hpp>
#include <fwTools/System.hpp>
......
......@@ -17,6 +17,6 @@ fwForwardInclude(
)
fwLink(
${Boost_LIBRARIES}
vtkHybrid
vtkIOImport
)
......@@ -6,6 +6,8 @@
#include <fstream>
#include <boost/filesystem/operations.hpp>
#include <fwRuntime/EConfigurationElement.hpp>
#include <fwRuntime/profile/Profile.hpp>
......
......@@ -6,6 +6,7 @@
#include <boost/filesystem/path.hpp>
#include <boost/algorithm/string/trim.hpp>
#include <boost/filesystem/operations.hpp>
#include <fwRuntime/EConfigurationElement.hpp>
#include <fwRuntime/profile/Profile.hpp>
......
......@@ -15,6 +15,6 @@ fwForwardInclude(
)
fwLink(
${Boost_LIBRARIES}
vtkWidgets
vtkInteractionWidgets
)
......@@ -10,8 +10,7 @@ fwUseForwardInclude(
)
find_package(Boost REQUIRED)
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
include(${QT_USE_FILE})
find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
fwForwardInclude(
......
......@@ -2,8 +2,7 @@
fwLoadProperties()
find_package (Boost REQUIRED)
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
include(${QT_USE_FILE})
find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
find_package(CppUnit)
fwInclude(${Boost_INCLUDE_DIRS} ${CPPUNIT_INCLUDE_DIR})
fwLink(${Boost_LIBRARIES} ${CPPUNIT_LIBRARY})
......
......@@ -11,8 +11,7 @@ fwUseForwardInclude(
find_package(Boost REQUIRED)
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
include(${QT_USE_FILE})
find_package(Qt5 COMPONENTS Core Gui Widgets Concurrent REQUIRED)
find_package (LibXml2)
fwForwardInclude(
......
......@@ -7,10 +7,8 @@ fwUseForwardInclude(
find_package(Boost REQUIRED)
find_package(Qt4 COMPONENTS QtCore QtGui QtHelp REQUIRED)
find_package(Qt4 COMPONENTS QtWebKit)
include(${QT_USE_FILE})
find_package(Qt5 COMPONENTS Core Gui Help Widgets REQUIRED)
QT5_USE_MODULES(uiGenericQt Core Gui Help Widgets)
fwForwardInclude(
${Boost_INCLUDE_DIRS}
......
......@@ -9,8 +9,7 @@ fwUseForwardInclude(
)
find_package(Boost COMPONENTS filesystem REQUIRED)
find_package(Qt4 COMPONENTS QtCore QtGui QtHelp REQUIRED)
include(${QT_USE_FILE})
find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
fwForwardInclude(
......
......@@ -8,8 +8,7 @@ fwUseForwardInclude(
find_package(Boost REQUIRED)
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
include(${QT_USE_FILE})
find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
fwForwardInclude(
......
......@@ -18,8 +18,7 @@ fwReq(
)
find_package(Boost REQUIRED)
find_package(Qt4 COMPONENTS QtCore QtGui REQUIRED)
include(${QT_USE_FILE})
find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
fwForwardInclude(
${Boost_INCLUDE_DIRS}
......
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