[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [qca] /: cmake: after compiling put all static libs to lib directory
From:       Ivan Romanov <drizt () land ! ru>
Date:       2014-01-31 21:42:02
Message-ID: E1W9Lqc-0002mW-PY () scm ! kde ! org
[Download RAW message or body]

Git commit 2502aad59d7074d1f84215eb5a29148e1737a474 by Ivan Romanov.
Committed on 31/01/2014 at 21:31.
Pushed by iromanov into branch 'master'.

cmake: after compiling put all static libs to lib directory

M  +3    -0    CMakeLists.txt
M  +3    -0    plugins/CMakeLists.txt

http://commits.kde.org/qca/2502aad59d7074d1f84215eb5a29148e1737a474

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 197db1e..7087691 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,7 +141,10 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
 set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 =

 set(qca_INCLUDEDIR "${CMAKE_CURRENT_SOURCE_DIR}/include" )
+
+# Use the same path for shared and static library
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" )
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" )
 =

 if( QCA_INSTALL_IN_QT_PREFIX )
   set(QCA_PREFIX_INSTALL_DIR "${QT_PREFIX_DIR}" CACHE PATH "Directory wher=
e qca will install")
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 6e08bae..258b0b0 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,4 +1,7 @@
+# Use the same path for shared and static plugins
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${QCA_LIB_NAME=
}/crypto")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib/${QCA_LIB_NAME=
}/crypto")
+
 set(PLUGINS "botan;cyrus-sasl;gcrypt;gnupg;logger;nss;ossl;pkcs11;softstor=
e" CACHE INTERNAL "")
 =

 # Initialize WITH_${PLUGIN}_PLUGIN cache variables

[prev in list] [next in list] [prev in thread] [next in thread]