Updated for win$ux

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fc0442238b259aca44a3e6c2eab0996ca18c745d..e4f2e37e0ef5d5cbc9b60406c5414ede44546a0c 100644 (file)
--- 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 d32fafbaecc7e9b307118c558ae385962fe5eb43..372b1504dbb12cfb3f07cc48392fff9958a773ea 100644 (file)
--- 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$