build static library versions of libi2ncommon too

diff --git a/configlib/CMakeLists.txt b/configlib/CMakeLists.txt
index f0af069..75a138a 100644 (file)
--- a/configlib/CMakeLists.txt
+++ b/configlib/CMakeLists.txt
@@ -9,14 +9,20 @@ set(cpp_headers
 )
 
 add_library(i2ncommon_config SHARED ${cpp_sources} ${cpp_headers})
-
 set_target_properties(i2ncommon_config PROPERTIES VERSION ${VERSION} SOVERSION 3)
+set_target_properties(i2ncommon_config PROPERTIES OUTPUT_NAME i2ncommon_config CLEAN_DIRECT_OUTPUT 1)
 
+add_library(i2ncommon_config_static STATIC ${cpp_sources} ${cpp_headers})
+set_target_properties(i2ncommon_config_static PROPERTIES OUTPUT_NAME i2ncommon_config CLEAN_DIRECT_OUTPUT 1)
 
 install(TARGETS i2ncommon_config
         LIBRARY DESTINATION lib${LIB_SUFFIX}
         COMPONENT sharedlibs)
 
+install(TARGETS i2ncommon_config_static
+        ARCHIVE DESTINATION lib${LIB_SUFFIX}
+        COMPONENT staticlibs)
+
 install(FILES ${cpp_headers}
         DESTINATION include/${PROJECT_NAME}
         COMPONENT headers)

diff --git a/libi2ncommon.spec b/libi2ncommon.spec
index 2649260..c293f8f 100644 (file)
--- a/libi2ncommon.spec
+++ b/libi2ncommon.spec
@@ -118,8 +118,7 @@ rm -fr $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-,root,root)
-# No static library for now
-#%{prefix}/lib/*.*a*
+%{_libdir}/*.*a*
 %{_libdir}/libi2ncommon.so
 %{_libdir}/pkgconfig/*.pc
 %{_includedir}/libi2ncommon/*

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e9fe706..e0eae1e 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -65,11 +65,19 @@ target_link_libraries(i2ncommon
                       ${OPENSSL_LIBRARIES})
 
 set_target_properties(i2ncommon PROPERTIES VERSION ${VERSION} SOVERSION 6)
+set_target_properties(i2ncommon PROPERTIES OUTPUT_NAME i2ncommon CLEAN_DIRECT_OUTPUT 1)
+
+add_library(i2ncommon_static STATIC ${cpp_sources} ${cpp_headers})
+set_target_properties(i2ncommon_static PROPERTIES OUTPUT_NAME i2ncommon CLEAN_DIRECT_OUTPUT 1)
 
 install(TARGETS i2ncommon
         LIBRARY DESTINATION lib${LIB_SUFFIX}
         COMPONENT sharedlibs)
 
+install(TARGETS i2ncommon_static
+        ARCHIVE DESTINATION lib${LIB_SUFFIX}
+        COMPONENT staticlibs)
+
 install(FILES ${cpp_headers}
         DESTINATION include/${PROJECT_NAME}
         COMPONENT headers)

diff --git a/utils/CMakeLists.txt b/utils/CMakeLists.txt
index b2e0d2b..a4e15e8 100644 (file)
--- a/utils/CMakeLists.txt
+++ b/utils/CMakeLists.txt
@@ -13,12 +13,20 @@ set(cpp_headers
 add_library(i2ncommon_utils SHARED ${cpp_sources} ${cpp_headers})
 
 set_target_properties(i2ncommon_utils PROPERTIES VERSION ${VERSION} SOVERSION 4)
+set_target_properties(i2ncommon_utils PROPERTIES OUTPUT_NAME i2ncommon_utils CLEAN_DIRECT_OUTPUT 1)
+
+add_library(i2ncommon_utils_static STATIC ${cpp_sources} ${cpp_headers})
+set_target_properties(i2ncommon_utils_static PROPERTIES OUTPUT_NAME i2ncommon_utils CLEAN_DIRECT_OUTPUT 1)
 
 
 install(TARGETS i2ncommon_utils
         LIBRARY DESTINATION lib${LIB_SUFFIX}
         COMPONENT sharedlibs)
 
+install(TARGETS i2ncommon_utils_static
+        ARCHIVE DESTINATION lib${LIB_SUFFIX}
+        COMPONENT staticlibs)
+
 install(FILES ${cpp_headers}
         DESTINATION include/${PROJECT_NAME}
         COMPONENT headers)

diff --git a/xmllib/CMakeLists.txt b/xmllib/CMakeLists.txt
index 4e3902d..d7bdaa7 100644 (file)
--- a/xmllib/CMakeLists.txt
+++ b/xmllib/CMakeLists.txt
@@ -13,15 +13,22 @@ set(cpp_headers
 )
 
 add_library(i2ncommon_xml SHARED ${cpp_sources} ${cpp_headers})
-
 target_link_libraries(i2ncommon_xml ${Xmlpp_LIBRARIES})
-
 set_target_properties(i2ncommon_xml PROPERTIES VERSION ${VERSION} SOVERSION 4)
+set_target_properties(i2ncommon_xml PROPERTIES OUTPUT_NAME i2ncommon_xml CLEAN_DIRECT_OUTPUT 1)
+
+add_library(i2ncommon_xml_static STATIC ${cpp_sources} ${cpp_headers})
+set_target_properties(i2ncommon_xml_static PROPERTIES OUTPUT_NAME i2ncommon_xml CLEAN_DIRECT_OUTPUT 1)
+
 
 install(TARGETS i2ncommon_xml
         LIBRARY DESTINATION lib${LIB_SUFFIX}
         COMPONENT sharedlibs)
 
+install(TARGETS i2ncommon_xml_static
+        ARCHIVE DESTINATION lib${LIB_SUFFIX}
+        COMPONENT staticlibs)
+
 install(FILES ${cpp_headers}
         DESTINATION include/${PROJECT_NAME}
         COMPONENT headers)