From: Leonardo Florez Valencia Date: Sun, 1 Feb 2015 18:04:25 +0000 (+0100) Subject: Updated for win$ux X-Git-Tag: v0.1~415^2 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=60ecd2494207dc95b1bad56976da57d109b6ef4e;p=cpPlugins.git Updated for win$ux --- diff --git a/CMakeLists.txt b/CMakeLists.txt index fc04422..e4f2e37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,7 @@ FIND_PACKAGE(VTK REQUIRED) INCLUDE(${VTK_USE_FILE}) IF(USE_QT4) + IF(NOT WIN32) FIND_LIBRARY( VTK_USES_QT NAMES vtkGUISupportQt-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} @@ -69,6 +70,10 @@ IF(USE_QT4) ELSE(VTK_USES_QT AND VTK_USES_QT_OPENGL) MESSAGE(FATAL_ERROR "VTK ${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION} was not compiled with Qt4 support!") ENDIF(VTK_USES_QT AND VTK_USES_QT_OPENGL) + ELSE(NOT WIN32) + FIND_PACKAGE(Qt4 REQUIRED) + INCLUDE(${QT_USE_FILE}) + ENDIF(NOT WIN32) ENDIF(USE_QT4) ## ================================================ diff --git a/lib/cpPlugins/Plugins/CMakeLists.txt b/lib/cpPlugins/Plugins/CMakeLists.txt index d32fafb..372b150 100644 --- a/lib/cpPlugins/Plugins/CMakeLists.txt +++ b/lib/cpPlugins/Plugins/CMakeLists.txt @@ -32,6 +32,7 @@ GENERATE_EXPORT_HEADER( TARGET_LINK_LIBRARIES( ${LIBRARY_NAME} cpPlugins_Interface + ${ITK_LIBRARIES} ) ## eof - $RCSfile$