...

[cpPlugins.git] / cmake / cpPluginsConfig.cmake.in

diff --git a/cmake/cpPluginsConfig.cmake.in b/cmake/cpPluginsConfig.cmake.in
index ab0456cc23a2a7b52bb3446b846c61a6b654b39c..0564e9dba654a5d38c017907d614e7311cae5684 100644 (file)
--- a/cmake/cpPluginsConfig.cmake.in
+++ b/cmake/cpPluginsConfig.cmake.in
@@ -11,11 +11,11 @@ ENDIF("@Qt4_FOUND@" STREQUAL "TRUE")
 ## ====================
 
 SET(cpPlugins_BaseLibraries "@cpPlugins_BaseLibraries@" CACHE STRING "Internal")
-SET(cpPlugins_Instances "@cpPlugins_Instances@" CACHE STRING "Internal")
+SET(cpPlugins_AllInstances "@cpPlugins_AllInstances@" CACHE STRING "Internal")
 MARK_AS_ADVANCED(FORCE cpPlugins_BaseLibraries)
-MARK_AS_ADVANCED(FORCE cpPlugins_Instances)
+MARK_AS_ADVANCED(FORCE cpPlugins_AllInstances)
 
-SET(_all_libs ${cpPlugins_BaseLibraries} ${cpPlugins_Instances})
+SET(_all_libs ${cpPlugins_BaseLibraries} ${cpPlugins_AllInstances})
 
 SET(_l_locations)
 FOREACH(_l ${_all_libs})
@@ -51,44 +51,17 @@ ENDIF(_l_locations)
 ## == Find include directories ==
 ## ==============================
 
-#SET(cpPlugins_All_Headers "@cpPlugins_All_Headers@" CACHE STRING "Internal")
-#MARK_AS_ADVANCED(FORCE cpPlugins_All_Headers)
-#SET(_header_paths
-#  "@PROJECT_SOURCE_DIR@/lib"
-#  "@PROJECT_BINARY_DIR@/lib"
-#  "@PROJECT_SOURCE_DIR@/lib/Instances"
-#  "@PROJECT_BINARY_DIR@/lib/Instances"
-#  "@CMAKE_INSTALL_PREFIX@/include"
-#  )
-#FOREACH(_h ${cpPlugins_All_Headers})
-#  GET_FILENAME_COMPONENT(_h_name ${_h} NAME)
-#  GET_FILENAME_COMPONENT(_h_dir ${_h} DIRECTORY)
-#  FIND_PATH(
-#    _loc_${_h_name} ${_h_name}
-#    HINTS
-#    ${_header_paths}
-#    ${_h_dir}
-#    )
-#  IF(_loc_${_h_name})
-#    LIST(APPEND _header_paths ${_loc_${_h_name}})
-#    LIST(REMOVE_DUPLICATES _header_paths)
-#  ELSE(_loc_${_h_name})
-#    MESSAGE(FATAL_ERROR "Please configure where is ${_h_name}")
-#  ENDIF(_loc_${_h_name})
-#ENDFOREACH(_h ${cpPlugins_All_Headers})
-#MESSAGE(STATUS ${_header_paths})
-
 ## TODO: this is not completely correct!!!
 INCLUDE_DIRECTORIES(
   @CMAKE_INSTALL_PREFIX@/include
   @CMAKE_INSTALL_PREFIX@/include/cpPlugins/Itk2Vtk
-  @CMAKE_INSTALL_PREFIX@/include/cpPlugins/Instances
+  @CMAKE_INSTALL_PREFIX@/include/cpPlugins/cpInstances
   @PROJECT_SOURCE_DIR@
   @PROJECT_BINARY_DIR@
   @PROJECT_SOURCE_DIR@/lib
   @PROJECT_BINARY_DIR@/lib
-  @PROJECT_SOURCE_DIR@/lib/Instances
-  @PROJECT_BINARY_DIR@/lib/Instances
+  @PROJECT_SOURCE_DIR@/lib/cpInstances
+  @PROJECT_BINARY_DIR@/lib/cpInstances
   )
 
 ## ============================