Building a shared library for each module

Author: iagaponenko

src/CMakeLists.txt

@@ -91,61 +91,3 @@ add_subdirectory(www)
 add_subdirectory(xrdlog)
 add_subdirectory(xrdreq)
 add_subdirectory(xrdsvc)
-
-#-----------------------------------------------------------------------------
-
-add_library(qserv_common SHARED)
-
-target_link_libraries(qserv_common PUBLIC
-    global
-    memman
-    proto
-    mysql
-    sql
-    util
-)
-
-install(
-    TARGETS qserv_common
-)
-
-#-----------------------------------------------------------------------------
-
-add_library(xrdsvc SHARED)
-
-target_link_libraries(xrdsvc PUBLIC
-    wbase
-    wcontrol
-    wconfig
-    wdb
-    wpublish
-    wsched
-    qserv_xrdsvc
-    qserv_common
-)
-
-install(
-    TARGETS xrdsvc
-)
-
-#-----------------------------------------------------------------------------
-
-add_library(qserv_czar SHARED)
-
-target_link_libraries(qserv_czar PUBLIC
-    ccontrol
-    czar
-    parser
-    qana
-    query
-    qdisp
-    qproc
-    rproc
-    qserv_css
-    qserv_meta
-    xrdreq
-)
-
-install(
-    TARGETS qserv_czar
-)

src/cconfig/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(cconfig OBJECT)
+add_library(cconfig SHARED)
 
 target_sources(cconfig PRIVATE
     CzarConfig.cc
@@ -12,3 +12,7 @@ target_link_libraries(cconfig PUBLIC
     log
     XrdSsiLib
 )
+
+install(
+    TARGETS cconfig
+)

src/ccontrol/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(ccontrol OBJECT)
+add_library(ccontrol SHARED)
 add_dependencies(ccontrol proto)
 
 target_include_directories(ccontrol PRIVATE
@@ -37,6 +37,10 @@ target_link_libraries(ccontrol PUBLIC
     XrdCl
 )
 
+install(
+    TARGETS ccontrol
+)
+
 FUNCTION(ccontrol_tests)
     FOREACH(TEST IN ITEMS ${ARGV})
         add_executable(${TEST} ${TEST}.cc)
@@ -48,8 +52,8 @@ FUNCTION(ccontrol_tests)
             qana
             qdisp
             qproc
-            qserv_css
-            qserv_meta
+            css
+            qmeta
             query
             rproc
             xrdreq

src/css/CMakeLists.txt

@@ -1,6 +1,6 @@
-add_library(qserv_css SHARED)
+add_library(css SHARED)
 
-target_sources(qserv_css PRIVATE
+target_sources(css PRIVATE
     CssAccess.cc
     CssConfig.cc
     DbInterfaceMySql.cc
@@ -9,19 +9,21 @@ target_sources(qserv_css PRIVATE
     KvInterfaceImplMySql.cc
 )
 
-target_link_libraries(qserv_css PUBLIC
-    qserv_common
+target_link_libraries(css PUBLIC
+    mysql
+    sql
     log
+    util
 )
 
-install(TARGETS qserv_css)
+install(TARGETS css)
 install(DIRECTORY schema/ DESTINATION ${CMAKE_INSTALL_PREFIX}/qserv/smig/css/schema/)
 
 FUNCTION(css_tests)
     FOREACH(TEST IN ITEMS ${ARGV})
         add_executable(${TEST} ${TEST}.cc)
         target_link_libraries(${TEST} PUBLIC
-            qserv_css
+            css
             Boost::unit_test_framework
         )
         add_test(NAME ${TEST} COMMAND ${TEST})

src/czar/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(czar OBJECT)
+add_library(czar SHARED)
 
 target_sources(czar PRIVATE
     ChttpModule.cc
@@ -31,6 +31,10 @@ target_link_libraries(czar PUBLIC
     boost_program_options
 )
 
+install(
+    TARGETS czar
+)
+
 function(CZAR_UTILS)
     foreach(UTIL IN ITEMS ${ARGV})
         add_executable(${UTIL})
@@ -46,7 +50,7 @@ function(CZAR_UTILS)
             qana
             qdisp
             qproc
-            qserv_meta
+            qmeta
             query
             rproc
             sql

src/global/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(global OBJECT)
+add_library(global SHARED)
 
 target_sources(global PRIVATE
     DbTable.cc
@@ -12,6 +12,10 @@ target_link_libraries(global PUBLIC
     log
 )
 
+install(
+    TARGETS global
+)
+
 add_executable(testResourceUnit testResourceUnit.cc)
 
 target_link_libraries(testResourceUnit

src/memman/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(memman OBJECT)
+add_library(memman SHARED)
 
 target_sources(memman PRIVATE
     MemFile.cc
@@ -11,3 +11,7 @@ target_sources(memman PRIVATE
 target_link_libraries(memman PUBLIC
     log
 )
+
+install(
+    TARGETS memman
+)

src/mysql/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(mysql OBJECT)
+add_library(mysql SHARED)
 add_dependencies(mysql proto)
 
 target_sources(mysql PRIVATE
@@ -15,6 +15,10 @@ target_link_libraries(mysql PUBLIC
     mysqlclient_r
 )
 
+install(
+    TARGETS mysql
+)
+
 add_executable(testLocalInfile testLocalInfile.cc)
 
 target_link_libraries(testLocalInfile

src/parser/CMakeLists.txt

@@ -8,7 +8,7 @@ antlr_target(QSMySqlParser QSMySqlParser.g4 PARSER LISTENER
     COMPILE_FLAGS -lib ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-add_library(parser OBJECT)
+add_library(parser SHARED)
 
 target_include_directories(parser PRIVATE 
     ${ANTLR4_INCLUDE_DIR}
@@ -28,3 +28,7 @@ target_link_libraries(parser PUBLIC
     log
     antlr4-runtime
 )
+
+install(
+    TARGETS parser
+)

src/proto/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(proto OBJECT)
+add_library(proto SHARED)
 
 target_compile_options(proto PRIVATE
     -Wno-maybe-uninitialized
@@ -19,6 +19,10 @@ target_link_libraries(proto PUBLIC
     protobuf
 )
 
+install(
+    TARGETS proto
+)
+
 add_executable(testProtocol testProtocol.cc)
 
 target_link_libraries(testProtocol