Build mock_server as a library

The files is used from different test suites and currently
one needs to update the list of libraries for all targets
if one wants to use functionality from a new library.

Change-Id: Iace393c7386a43d147c64ed01cf3f99d5de458b3
Reviewed-on: http://review.couchbase.org/108151
Tested-by: Build Bot <[email protected]>
Reviewed-by: Dave Rigby <[email protected]>

Author: trondn

engines/ep/CMakeLists.txt

@@ -411,9 +411,6 @@ if (NOT EP_BYPASS_TESTS)
                    $<TARGET_OBJECTS:memory_tracking>
                    $<TARGET_OBJECTS:couchstore_test_fileops>
                    $<TARGET_OBJECTS:couchfile_upgrade_objects>
-                   ${Memcached_SOURCE_DIR}/programs/engine_testapp/mock_server.cc
-                   ${Memcached_SOURCE_DIR}/daemon/doc_pre_expiry.cc
-                   ${Memcached_SOURCE_DIR}/daemon/protocol/mcbp/engine_errc_2_mcbp.cc
                    ${Memcached_SOURCE_DIR}/logger/logger_test_fixture.cc)
 
     TARGET_INCLUDE_DIRECTORIES(ep-engine_ep_unit_tests
@@ -424,7 +421,7 @@ if (NOT EP_BYPASS_TESTS)
                           dirutils engine_utilities ep-engine_collections gtest
                           gmock hdr_histogram_static JSON_checker
                           memcached_logger mcbp mcd_util mcd_tracing platform
-                          phosphor xattr cbcompress ${MALLOC_LIBRARIES}
+                          phosphor xattr cbcompress mock_server ${MALLOC_LIBRARIES}
                           ${LIBEVENT_LIBRARIES}
                           ${FOLLY_LIBRARIES})
 

programs/engine_testapp/CMakeLists.txt

@@ -1,25 +1,31 @@
-ADD_EXECUTABLE(engine_testapp engine_testapp.cc
-               mock_server.cc
-               mock_server.h
-               ${Memcached_SOURCE_DIR}/daemon/protocol/mcbp/engine_errc_2_mcbp.cc
-               ${Memcached_SOURCE_DIR}/daemon/protocol/mcbp/engine_errc_2_mcbp.h
-               ${Memcached_SOURCE_DIR}/daemon/doc_pre_expiry.cc
-               $<TARGET_OBJECTS:memory_tracking>)
+add_library(mock_server STATIC
+            mock_server.cc
+            mock_server.h
+            ${Memcached_SOURCE_DIR}/daemon/protocol/mcbp/engine_errc_2_mcbp.cc
+            ${Memcached_SOURCE_DIR}/daemon/protocol/mcbp/engine_errc_2_mcbp.h
+            ${Memcached_SOURCE_DIR}/daemon/doc_pre_expiry.cc
+            $<TARGET_OBJECTS:memory_tracking>)
+set_property(TARGET mock_server PROPERTY POSITION_INDEPENDENT_CODE 1)
+target_link_libraries(mock_server INTERFACE
+                      memcached_logger
+                      mcd_tracing
+                      mcd_util
+                      platform
+                      xattr
+		      ${MALLOC_LIBRARIES})
 
-TARGET_LINK_LIBRARIES(engine_testapp PRIVATE
-		memcached_logger
-		mcd_util
-		mcd_tracing
+add_executable(engine_testapp engine_testapp.cc)
+target_link_libraries(engine_testapp PRIVATE
 		phosphor
 		platform
-		xattr
-		${MALLOC_LIBRARIES}
+		mock_server
 		${COUCHBASE_NETWORK_LIBS})
+
 add_sanitizers(engine_testapp)
-INSTALL(TARGETS engine_testapp
+install(TARGETS engine_testapp
         RUNTIME DESTINATION bin)
 
-ADD_TEST(NAME memcached-basic-engine-tests
+add_test(NAME memcached-basic-engine-tests
          WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
          COMMAND engine_testapp -E default_engine.so
 	                        -T basic_engine_testsuite.so)

tests/tracing/CMakeLists.txt

@@ -1,34 +1,20 @@
-ADD_EXECUTABLE(tracing_test
+add_executable(tracing_test
                tracing_test.cc)
 
-TARGET_LINK_LIBRARIES(tracing_test
+target_link_libraries(tracing_test
   mcd_tracing memcached_daemon gtest gtest_main)
 
-ADD_SANITIZERS(tracing_test)
+add_sanitizers(tracing_test)
 
-ADD_TEST(NAME tracing-test
+add_test(NAME tracing-test
          WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
          COMMAND tracing_test)
 
-set(mock_server_SOURCE
-  ${Memcached_SOURCE_DIR}/programs/engine_testapp/mock_server.cc
-  ${Memcached_SOURCE_DIR}/daemon/doc_pre_expiry.cc
-  ${Memcached_SOURCE_DIR}/daemon/protocol/mcbp/engine_errc_2_mcbp.cc
-  $<TARGET_OBJECTS:memory_tracking>)
+add_executable(tracing_bench tracing_bench.cc)
+
+target_include_directories(tracing_bench SYSTEM PRIVATE
+                           ${benchmark_SOURCE_DIR}/include)
+
+target_link_libraries(tracing_bench PRIVATE benchmark mock_server)
 
-add_executable(tracing_bench
-  tracing_bench.cc
-  ${mock_server_SOURCE})
-target_include_directories(tracing_bench
-    PRIVATE
-    ${benchmark_SOURCE_DIR}/include)
-target_link_libraries(tracing_bench
-  PRIVATE
-    benchmark
-    mcd_tracing
-    mcd_util
-    memcached_logger
-    platform
-    xattr
-    ${MALLOC_LIBRARIES})
 add_sanitizers(tracing_bench)