X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=cmake%2FcpPluginsConfig.cmake.in;h=7a2c72a42cd2023c2d7f50b7676a34271b3abf09;hb=4985f4ba986f600298676866c5099b2f84bee50b;hp=0564e9dba654a5d38c017907d614e7311cae5684;hpb=9f494b26ae4e5de45b4c2119a10de67ac0beeedf;p=cpPlugins.git

diff --git a/cmake/cpPluginsConfig.cmake.in b/cmake/cpPluginsConfig.cmake.in
index 0564e9d..7a2c72a 100644
--- a/cmake/cpPluginsConfig.cmake.in
+++ b/cmake/cpPluginsConfig.cmake.in
@@ -2,48 +2,56 @@
 ## == Find cpPlugins-cmake tools ==
 ## ================================
 
+SET(ITK_DIR "@ITK_DIR@")
+SET(VTK_DIR "@VTK_DIR@")
 IF("@Qt4_FOUND@" STREQUAL "TRUE")
   SET(USE_QT4 ON)
+  SET(QT_QMAKE_EXECUTABLE "@QT_QMAKE_EXECUTABLE@")
 ENDIF("@Qt4_FOUND@" STREQUAL "TRUE")
 
 ## ====================
 ## == Find libraries ==
 ## ====================
 
-SET(cpPlugins_BaseLibraries "@cpPlugins_BaseLibraries@" CACHE STRING "Internal")
-SET(cpPlugins_AllInstances "@cpPlugins_AllInstances@" CACHE STRING "Internal")
-MARK_AS_ADVANCED(FORCE cpPlugins_BaseLibraries)
+SET(
+  cpPlugins_AllInstances
+  "@cpPlugins_AllInstances@"
+  CACHE STRING "All instances from templated code"
+  )
 MARK_AS_ADVANCED(FORCE cpPlugins_AllInstances)
 
-SET(_all_libs ${cpPlugins_BaseLibraries} ${cpPlugins_AllInstances})
+SET(
+  _all_libs
+  cp_tinyxml2
+  cpExtensions
+  cpPlugins
+  cpPluginsDataObjects
+  )
+IF(USE_QT4)
+  LIST(APPEND _all_libs cp_QCustomPlot cpBaseQtApplication)
+ENDIF(USE_QT4)
+SET(cpPlugins_Libraries ${_all_libs} CACHE STRING "cpPlugins base libraries")
+MARK_AS_ADVANCED(FORCE cpPlugins_Libraries)
 
+SET(_all_libs ${cpPlugins_AllInstances} ${cpPlugins_Libraries})
 SET(_l_locations)
 FOREACH(_l ${_all_libs})
-  IF(MSVC)
-    FIND_LIBRARY(
-      ${_l}_LIB NAMES ${_l}
-      HINTS
-      @PROJECT_BINARY_DIR@/$(ConfigurationName)
-      @CMAKE_INSTALL_PREFIX@/bin
-      @CMAKE_INSTALL_PREFIX@/lib
-      )
-  ELSE(MSVC)
-    FIND_LIBRARY(
-      ${_l}_LIB NAMES ${_l}
-      HINTS
-      @PROJECT_BINARY_DIR@
-      @CMAKE_INSTALL_PREFIX@/bin
-      @CMAKE_INSTALL_PREFIX@/lib
-      )
-  ENDIF(MSVC)
+  FIND_LIBRARY(
+    ${_l}_LIB NAMES ${_l}
+    PATHS
+    @PROJECT_BINARY_DIR@
+    @CMAKE_INSTALL_PREFIX@/bin
+    @CMAKE_INSTALL_PREFIX@/lib
+    ${_l_locations}
+    )
   IF(${_l}_LIB)
     MARK_AS_ADVANCED(FORCE ${_l}_LIB)
     GET_FILENAME_COMPONENT(_dir ${${_l}_LIB} DIRECTORY)
     LIST(APPEND _l_locations ${_dir})
+    LIST(REMOVE_DUPLICATES _l_locations)
   ENDIF(${_l}_LIB)
 ENDFOREACH(_l)
 IF(_l_locations)
-  LIST(REMOVE_DUPLICATES _l_locations)
   LINK_DIRECTORIES(${_l_locations})
 ENDIF(_l_locations)
 
@@ -54,7 +62,6 @@ ENDIF(_l_locations)
 ## TODO: this is not completely correct!!!
 INCLUDE_DIRECTORIES(
   @CMAKE_INSTALL_PREFIX@/include
-  @CMAKE_INSTALL_PREFIX@/include/cpPlugins/Itk2Vtk
   @CMAKE_INSTALL_PREFIX@/include/cpPlugins/cpInstances
   @PROJECT_SOURCE_DIR@
   @PROJECT_BINARY_DIR@
@@ -77,42 +84,33 @@ SET(
   "@cpPlugins_bash_HostCreator_APP@"
   )
 
-FOREACH(_prog ${_exec_programs})
-  IF(MSVC)
-    FIND_PROGRAM(
-      ${_prog}_APP
-      NAMES ${_prog}
-      HINTS /usr /usr/local
-      PATHS @CMAKE_INSTALL_PREFIX@/bin @PROJECT_BINARY_DIR@/$(ConfigurationName)
-      PATH_SUFFIXES bin sbin
-      DOC "Where is ${_prog}?"
-      )
-  ELSE(MSVC)
-    FIND_PROGRAM(
-      ${_prog}_APP
-      NAMES ${_prog}
-      HINTS /usr /usr/local
-      PATHS @CMAKE_INSTALL_PREFIX@/bin @PROJECT_BINARY_DIR@
-      PATH_SUFFIXES bin sbin
-      DOC "Where is ${_prog}?"
-      )
-  ENDIF(MSVC)
-  MARK_AS_ADVANCED(FORCE ${_prog}_APP)
-ENDFOREACH(_prog)
+SET(_b_locations)
+FOREACH(_p ${_exec_programs})
+  FIND_PROGRAM(
+    ${_p}_APP
+    NAMES ${_p}
+    HINTS /usr /usr/local
+    PATHS @CMAKE_INSTALL_PREFIX@/bin @PROJECT_BINARY_DIR@ ${_b_locations}
+    PATH_SUFFIXES bin sbin
+    DOC "Where is ${_prog}?"
+    )
+  IF(${_p}_APP)
+    MARK_AS_ADVANCED(FORCE ${_p}_APP)
+    GET_FILENAME_COMPONENT(_dir ${${_p}_APP} DIRECTORY)
+    LIST(APPEND _b_locations ${_dir})
+    LIST(REMOVE_DUPLICATES _b_locations)
+  ENDIF(${_p}_APP)
+ENDFOREACH(_p)
 
 ## ==========================
 ## == Configuration values ==
 ## ==========================
 
-SET(cpPlugins_CONFIG_NUMBER_OF_FILES @cpPlugins_CONFIG_NUMBER_OF_FILES@ CACHE STRING "Internal")
-SET(cpPlugins_CONFIG_INTEGER_TYPES @cpPlugins_CONFIG_INTEGER_TYPES@ CACHE STRING "Internal")
-SET(cpPlugins_CONFIG_REAL_TYPES @cpPlugins_CONFIG_REAL_TYPES@ 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_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")
 
 MARK_AS_ADVANCED(FORCE cpPlugins_CONFIG_NUMBER_OF_FILES)
-MARK_AS_ADVANCED(FORCE cpPlugins_CONFIG_INTEGER_TYPES)
-MARK_AS_ADVANCED(FORCE cpPlugins_CONFIG_REAL_TYPES)
 MARK_AS_ADVANCED(FORCE cpPlugins_CONFIG_PROCESS_DIMENSIONS)
 MARK_AS_ADVANCED(FORCE cpPlugins_CONFIG_VISUAL_DIMENSIONS)