X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=cmake%2FcpPluginsConfig.cmake.in;h=0a65b42efeabb07bdecf7cfd486411f432caae69;hb=8aec252963919f155cd49076f3da8b2e40968873;hp=7a2c72a42cd2023c2d7f50b7676a34271b3abf09;hpb=4985f4ba986f600298676866c5099b2f84bee50b;p=cpPlugins.git

diff --git a/cmake/cpPluginsConfig.cmake.in b/cmake/cpPluginsConfig.cmake.in
index 7a2c72a..0a65b42 100644
--- a/cmake/cpPluginsConfig.cmake.in
+++ b/cmake/cpPluginsConfig.cmake.in
@@ -5,7 +5,7 @@
 SET(ITK_DIR "@ITK_DIR@")
 SET(VTK_DIR "@VTK_DIR@")
 IF("@Qt4_FOUND@" STREQUAL "TRUE")
-  SET(USE_QT4 ON)
+  SET(BUILD_QT4_COMPONENTS ON)
   SET(QT_QMAKE_EXECUTABLE "@QT_QMAKE_EXECUTABLE@")
 ENDIF("@Qt4_FOUND@" STREQUAL "TRUE")
 
@@ -15,20 +15,23 @@ ENDIF("@Qt4_FOUND@" STREQUAL "TRUE")
 
 SET(
   cpPlugins_AllInstances
-  "@cpPlugins_AllInstances@"
+  cpInstances_BaseObjects
+  cpInstances_Images
+  cpInstances_Geometries
+  cpInstances_Extensions
   CACHE STRING "All instances from templated code"
   )
 MARK_AS_ADVANCED(FORCE cpPlugins_AllInstances)
 
 SET(
   _all_libs
-  cp_tinyxml2
   cpExtensions
   cpPlugins
   cpPluginsDataObjects
   )
 IF(USE_QT4)
-  LIST(APPEND _all_libs cp_QCustomPlot cpBaseQtApplication)
+  LIST(APPEND _all_libs cpBaseQtApplication)
+  LIST(APPEND _all_libs cp_QCustomPlot)
 ENDIF(USE_QT4)
 SET(cpPlugins_Libraries ${_all_libs} CACHE STRING "cpPlugins base libraries")
 MARK_AS_ADVANCED(FORCE cpPlugins_Libraries)
@@ -106,12 +109,12 @@ ENDFOREACH(_p)
 ## == Configuration values ==
 ## ==========================
 
-SET(cpPlugins_CONFIG_NUMBER_OF_FILES "@cpPlugins_CONFIG_NUMBER_OF_FILES@" CACHE STRING "Internal")
-SET(cpPlugins_CONFIG_PROCESS_DIMENSIONS "@cpPlugins_CONFIG_PROCESS_DIMENSIONS@" CACHE STRING "Internal")
-SET(cpPlugins_CONFIG_VISUAL_DIMENSIONS "@cpPlugins_CONFIG_VISUAL_DIMENSIONS@" CACHE STRING "Internal")
+SET(cpPlugins_NUMBER_OF_FILES "@cpPlugins_NUMBER_OF_FILES@" CACHE STRING "Internal")
+SET(cpPlugins_PROCESS_DIMS "@cpPlugins_PROCESS_DIMS@" CACHE STRING "Internal")
+SET(cpPlugins_VISUAL_DIMS "@cpPlugins_VISUAL_DIMS@" CACHE STRING "Internal")
 
-MARK_AS_ADVANCED(FORCE cpPlugins_CONFIG_NUMBER_OF_FILES)
-MARK_AS_ADVANCED(FORCE cpPlugins_CONFIG_PROCESS_DIMENSIONS)
-MARK_AS_ADVANCED(FORCE cpPlugins_CONFIG_VISUAL_DIMENSIONS)
+MARK_AS_ADVANCED(FORCE cpPlugins_NUMBER_OF_FILES)
+MARK_AS_ADVANCED(FORCE cpPlugins_PROCESS_DIMS)
+MARK_AS_ADVANCED(FORCE cpPlugins_VISUAL_DIMS)
 
 ## eof - $RCSfile$