X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FCMakeLists.txt;h=bf5213eaed81aa4501e01df94f8bdbee9f43b951;hb=510ac31d52c1ac725baf278243c958e6c564b5b3;hp=0183e8ea86b203c74114d1efe08976e195e95230;hpb=47b6ec1790c1c9cb9c8396168e73f1c9f3c764bc;p=cpPlugins.git

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 0183e8e..bf5213e 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,22 +1,17 @@
-## ====================
-## == Base libraries ==
-## ====================
+
+## =========================
+## == Auxiliary libraries ==
+## =========================
 
 CompileLibFromDir(cp_tinyxml2 SHARED tinyxml2)
-IF(USE_QT4)
-  CompileLibFromDir(cp_QCustomPlot SHARED QCustomPlot)
-  TARGET_LINK_LIBRARIES(cp_QCustomPlot ${QT_LIBRARIES})
-ENDIF(USE_QT4)
 CompileLibFromDir(cpExtensions SHARED cpExtensions)
 TARGET_LINK_LIBRARIES(
   cpExtensions ${QT_LIBRARIES} ${ITK_LIBRARIES} ${VTK_LIBRARIES}
   )
-
-## ===============
-## == Instances ==
-## ===============
-
-SUBDIRS(Instances)
+IF(USE_QT4)
+  CompileLibFromDir(cp_QCustomPlot SHARED QCustomPlot)
+  TARGET_LINK_LIBRARIES(cp_QCustomPlot ${QT_LIBRARIES})
+ENDIF(USE_QT4)
 
 ## ==================
 ## == Main library ==
@@ -28,67 +23,29 @@ ADD_CUSTOM_COMMAND(
   COMMAND ${cpPlugins_bash_CreateRealConfig_APP} ${CMAKE_CURRENT_BINARY_DIR}/cpPlugins/RealConfig.h
   DEPENDS ${cpPlugins_bash_CreateRealConfig_APP}
   )
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/Instances)
-CompileLibFromDir(cpPlugins SHARED cpPlugins ${CMAKE_CURRENT_BINARY_DIR}/cpPlugins/RealConfig.h)
+CompileLibFromDir(
+  cpPlugins SHARED
+  ${CMAKE_CURRENT_SOURCE_DIR}/cpPlugins
+  ${CMAKE_CURRENT_BINARY_DIR}/cpPlugins/RealConfig.h
+  )
 TARGET_LINK_LIBRARIES(
   cpPlugins
   cp_tinyxml2
-  cpExtensions
   ${QT_LIBRARIES} ${ITK_LIBRARIES} ${VTK_LIBRARIES}
-  ${cpPlugins_Instances}
   )
 
-## =========================
-## == Even more libraries ==
-## =========================
-
-CompileLibFromDir(cpBaseQtApplication SHARED cpBaseQtApplication)
-TARGET_LINK_LIBRARIES(cpBaseQtApplication cpPlugins)
+## =====================
+## == Other libraries ==
+## =====================
 
-## ====================
-## == Base libraries ==
-## ====================
+SUBDIRS(cpInstances)
 
 IF(USE_QT4)
-  SET(
-    cpPlugins_BaseLibraries
-    cp_tinyxml2
-    cp_QCustomPlot
-    cpExtensions
-    cpPlugins
-    CACHE INTERNAL "All locally compiled libraries." FORCE
-    )
-ELSE(USE_QT4)
-  SET(
-    cpPlugins_BaseLibraries
-    cp_tinyxml2
-    cpExtensions
-    cpPlugins
-    CACHE INTERNAL "All locally compiled libraries." FORCE
+  CompileLibFromDir(cpBaseQtApplication SHARED cpBaseQtApplication)
+  TARGET_LINK_LIBRARIES(
+    cpBaseQtApplication
+    ${QT_LIBRARIES} cpExtensions cpPlugins
     )
 ENDIF(USE_QT4)
 
-## ===================================
-## == Libraries to dynamically load ==
-## ===================================
-
-SET(cpPlugins_DynLibs "${CMAKE_INSTALL_PREFIX}/bin|cpExtensions")
-LIST(APPEND cpPlugins_DynLibs "${CMAKE_INSTALL_PREFIX}/lib|cpExtensions")
-LIST(APPEND cpPlugins_DynLibs "${LIBRARY_OUTPUT_PATH}|cpExtensions")
-FOREACH(_lib ${cpPlugins_Instances})
-  LIST(APPEND cpPlugins_DynLibs "${CMAKE_INSTALL_PREFIX}/bin|${_lib}")
-  LIST(APPEND cpPlugins_DynLibs "${CMAKE_INSTALL_PREFIX}/lib|${_lib}")
-  LIST(APPEND cpPlugins_DynLibs "${LIBRARY_OUTPUT_PATH}|${_lib}")
-ENDFOREACH(_lib)
-LIST(APPEND cpPlugins_DynLibs "${VTK_INSTALL_PREFIX}/bin|vtk*")
-LIST(APPEND cpPlugins_DynLibs "${VTK_INSTALL_PREFIX}/lib|vtk*")
-LIST(APPEND cpPlugins_DynLibs "${ITK_INSTALL_PREFIX}/bin|itk*")
-LIST(APPEND cpPlugins_DynLibs "${ITK_INSTALL_PREFIX}/lib|itk*")
-LIST(APPEND cpPlugins_DynLibs "${ITK_INSTALL_PREFIX}/bin|ITK*")
-LIST(APPEND cpPlugins_DynLibs "${ITK_INSTALL_PREFIX}/lib|ITK*")
-FILE(WRITE ${PROJECT_BINARY_DIR}/cpPlugins_Libraries.config "")
-FOREACH(_lib ${cpPlugins_DynLibs})
-  FILE(APPEND ${PROJECT_BINARY_DIR}/cpPlugins_Libraries.config "${_lib}\n")
-ENDFOREACH(_lib)
-
-## eof - $RCSfilfe$
+## eof - $RCSfile$