...

[cpPlugins.git] / cmake / Functions.cmake

diff --git a/cmake/Functions.cmake b/cmake/Functions.cmake
index f5a90f3326c0895761db6d84473d604961df8631..287e69344f0f7a5ddc2b33ddcea4a020fe63f0dc 100644 (file)
--- a/cmake/Functions.cmake
+++ b/cmake/Functions.cmake
@@ -61,6 +61,7 @@ ENDFUNCTION()
 FUNCTION(
   CreateLib
   lib_name
+  lib_dir
   lib_type
   lib_source_files
   lib_header_files
@@ -94,13 +95,13 @@ ENDIF(Qt4_FOUND)
 ## -- Ok, compile library
 IF(_sources)
   NormPaths(_cur_binary_dir ${CMAKE_CURRENT_BINARY_DIR})
-  ADD_LIBRARY(${lib_name} SHARED ${_sources} ${_headers})
-  SET_TARGET_PROPERTIES(
-    ${lib_name}
-    PROPERTIES
-    VERSION "${lib_version}"
-    SOVERSION "${lib_short_version}"
-    )
+  ADD_LIBRARY(${lib_name} ${lib_type} ${_sources} ${_headers})
+  #SET_TARGET_PROPERTIES(
+  #  ${lib_name}
+  #  PROPERTIES
+  #  VERSION "${lib_version}"
+  #  SOVERSION "${lib_short_version}"
+  #  )
   GENERATE_EXPORT_HEADER(
     ${lib_name}
     BASE_NAME ${lib_name}
@@ -117,6 +118,7 @@ ENDFUNCTION()
 FUNCTION(
   LibFromDir
   lib_name
+  lib_dir
   lib_type
   lib_source_dir
   lib_version
@@ -200,7 +202,7 @@ ENDIF(ARGN)
 
 ## -- Create library
 CreateLib(
-  ${lib_name} ${lib_type}
+  ${lib_name} ${lib_dir} ${lib_type}
   "${_sources}" "${_headers}" "${_qt_uis}"
   "${lib_version}" "${lib_short_version}"
   )
@@ -211,6 +213,7 @@ ENDFUNCTION()
 FUNCTION(
   CompileInstances
   out_lib_name
+  lib_dir
   def_file
   number_of_files
   prefix
@@ -251,7 +254,7 @@ ADD_CUSTOM_COMMAND(
 
 ## -- Create library
 CreateLib(
-  "${_lib_name}" SHARED
+  "${_lib_name}" ${lib_dir} SHARED
   "${_all_out_code}" "${_out_header}" ""
   "${version}" "${short_version}"
   )
@@ -311,7 +314,7 @@ ENDIF(_hdr_to_wrap)
 ## -- Ok, build library
 IF(_all_src)
   CreateLib(
-    ${_lib_name} SHARED
+    ${_lib_name} leo SHARED
     "${_all_src}" "${_all_hdr}" "${_qt_ui}"
     "${version}" "${short_version}"
     ${ARGN}