...

[FrontAlgorithms.git] / lib / CMakeLists.txt

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 318a5fa381269d716866fbbe780250325fd5a702..b3bea387d974f6c46e602c12957f9aa8db646b80 100644 (file)
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -1,43 +1,27 @@
+## ======================================
+## == Build a library from a directory ==
+## ======================================
 
-## =========================================
-## == Manage every directory as a library ==
-## =========================================
+CompileLibFromDir(fpa SHARED ${CMAKE_CURRENT_SOURCE_DIR}/fpa)
 
-LibFromDir(
-  fpa
-  SHARED
-  ${CMAKE_CURRENT_SOURCE_DIR}/fpa
-  "${prj_VERSION}" "${prj_SHORT_VERSION}"
-  )
-
-## ==================================
-## == Compile cpPlugins-based code ==
-## ==================================
+## ===================================
+## == Build instances for cpPlugins ==
+## ===================================
 
+SET(fpa_DynLibs "${CMAKE_INSTALL_PREFIX}/bin|fpa")
+LIST(APPEND fpa_DynLibs "${CMAKE_INSTALL_PREFIX}/lib|fpa")
+LIST(APPEND fpa_DynLibs "${LIBRARY_OUTPUT_PATH}|fpa")
 IF(USE_cpPlugins)
-
-  ## =======================
-  ## == Compile instances ==
-  ## =======================
-
   SUBDIRS(Instances)
-
-  ## ===================================
-  ## == Libraries to dynamically load ==
-  ## ===================================
-
-  SET(
-    fpa_DynLibs
-    local@fpa
-    )
   FOREACH(_lib ${fpa_Instances})
-    LIST(APPEND fpa_DynLibs local@${_lib})
-  ENDFOREACH(_lib)
-  FILE(WRITE ${PROJECT_BINARY_DIR}/cpPlugins_Libraries.config "")
-  FOREACH(_lib ${fpa_DynLibs})
-    FILE(APPEND ${PROJECT_BINARY_DIR}/cpPlugins_Libraries.config "${_lib}\n")
+    LIST(APPEND fpa_DynLibs "${CMAKE_INSTALL_PREFIX}/bin|${_lib}")
+    LIST(APPEND fpa_DynLibs "${CMAKE_INSTALL_PREFIX}/lib|${_lib}")
+    LIST(APPEND fpa_DynLibs "${LIBRARY_OUTPUT_PATH}|${_lib}")
   ENDFOREACH(_lib)
-
 ENDIF(USE_cpPlugins)
+FILE(WRITE ${PROJECT_BINARY_DIR}/cpPlugins_Libraries.config "")
+FOREACH(_lib ${fpa_DynLibs})
+  FILE(APPEND ${PROJECT_BINARY_DIR}/cpPlugins_Libraries.config "${_lib}\n")
+ENDFOREACH(_lib)
 
 ## eof - $RCSfile$