Make static library for extra test sources to speed up compilation

Author: scpeters

cmake/GazeboTestUtils.cmake

@@ -21,12 +21,14 @@ macro (gz_build_tests)
       gazebo_rendering
       gazebo_msgs
       gazebo_transport
+      server_fixture
       )
 
 
     target_link_libraries(${BINARY_NAME}
       libgtest.a
       libgtest_main.a
+      libserver_fixture.a
       gazebo_common
       gazebo_math
       gazebo_physics

test/CMakeLists.txt

@@ -29,6 +29,17 @@ target_link_libraries(gtest_main gtest)
 set(GTEST_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest.a")
 set(GTEST_MAIN_LIBRARY "${PROJECT_BINARY_DIR}/test/libgtest_main.a")
 
+# Build static ServerFixture library
+set(ServerFixtureSources
+  ${PROJECT_SOURCE_DIR}/gazebo/Server.cc
+  ${PROJECT_SOURCE_DIR}/gazebo/Master.cc
+  ${PROJECT_SOURCE_DIR}/gazebo/gazebo.cc
+  ${PROJECT_SOURCE_DIR}/test/ServerFixture.cc
+)
+add_library(server_fixture STATIC ${ServerFixtureSources})
+add_dependencies(server_fixture gazebo_msgs)
+set(SERVER_FIXTURE_LIBRARY "${PROJECT_BINARY_DIR}/test/libserver_fixture.a")
+
 execute_process(COMMAND cmake -E remove_directory ${CMAKE_BINARY_DIR}/test_results)
 execute_process(COMMAND cmake -E make_directory ${CMAKE_BINARY_DIR}/test_results)
 include_directories(${GTEST_INCLUDE_DIRS})

test/integration/CMakeLists.txt

@@ -49,8 +49,7 @@ if (MANPAGES_SUPPORT)
 	      manpages.cc)
 endif()
 
-set (GZ_BUILD_TESTS_EXTRA_EXE_SRCS
-  "${PROJECT_SOURCE_DIR}/gazebo/Server.cc;${PROJECT_SOURCE_DIR}/gazebo/Master.cc;${PROJECT_SOURCE_DIR}/gazebo/gazebo.cc;${PROJECT_SOURCE_DIR}/test/ServerFixture.cc")
+set (GZ_BUILD_TESTS_EXTRA_EXE_SRCS "")
 gz_build_tests(${tests})
 
 if (ENABLE_TESTS_COMPILATION)
@@ -62,8 +61,7 @@ set(display_tests
 )
 
 # Build the display tests (need extra sources to compile)
-set (GZ_BUILD_TESTS_EXTRA_EXE_SRCS
-    "${PROJECT_SOURCE_DIR}/gazebo/Server.cc;${PROJECT_SOURCE_DIR}/gazebo/Master.cc;${PROJECT_SOURCE_DIR}/gazebo/gazebo.cc;${PROJECT_SOURCE_DIR}/test/ServerFixture.cc")
+set (GZ_BUILD_TESTS_EXTRA_EXE_SRCS "")
 gz_build_display_tests(${display_tests})
 
 set(dri_tests
@@ -78,8 +76,7 @@ set(dri_tests
   speed_pr2.cc
 )
 
-set (GZ_BUILD_TESTS_EXTRA_EXE_SRCS
-    "${PROJECT_SOURCE_DIR}/gazebo/Server.cc;${PROJECT_SOURCE_DIR}/gazebo/Master.cc;${PROJECT_SOURCE_DIR}/gazebo/gazebo.cc;${PROJECT_SOURCE_DIR}/test/ServerFixture.cc")
+set (GZ_BUILD_TESTS_EXTRA_EXE_SRCS "")
 gz_build_dri_tests(${dri_tests})
 
 

test/performance/CMakeLists.txt

@@ -25,7 +25,6 @@ if (NOT APPLE)
     transport_stress.cc
   )
 
-  set (GZ_BUILD_TESTS_EXTRA_EXE_SRCS
-    "${PROJECT_SOURCE_DIR}/gazebo/Server.cc;${PROJECT_SOURCE_DIR}/gazebo/Master.cc;${PROJECT_SOURCE_DIR}/gazebo/gazebo.cc;${PROJECT_SOURCE_DIR}/test/ServerFixture.cc")
+  set (GZ_BUILD_TESTS_EXTRA_EXE_SRCS "")
   gz_build_tests(${tests})
 endif()

test/regression/CMakeLists.txt

@@ -22,21 +22,18 @@ set(tests
   876_random_number_generator.cc
 )
 
-set (GZ_BUILD_TESTS_EXTRA_EXE_SRCS
-  "${PROJECT_SOURCE_DIR}/gazebo/Server.cc;${PROJECT_SOURCE_DIR}/gazebo/Master.cc;${PROJECT_SOURCE_DIR}/gazebo/gazebo.cc;${PROJECT_SOURCE_DIR}/test/ServerFixture.cc")
+set (GZ_BUILD_TESTS_EXTRA_EXE_SRCS "")
 gz_build_tests(${tests})
 
 set(display_tests
 )
 
 # Build the display tests (need extra sources to compile)
-set (GZ_BUILD_TESTS_EXTRA_EXE_SRCS
-    "${PROJECT_SOURCE_DIR}/gazebo/Server.cc;${PROJECT_SOURCE_DIR}/gazebo/Master.cc;${PROJECT_SOURCE_DIR}/gazebo/gazebo.cc;${PROJECT_SOURCE_DIR}/test/ServerFixture.cc")
+set (GZ_BUILD_TESTS_EXTRA_EXE_SRCS "")
 gz_build_display_tests(${display_tests})
 
 set(dri_tests
 )
 
-set (GZ_BUILD_TESTS_EXTRA_EXE_SRCS
-    "${PROJECT_SOURCE_DIR}/gazebo/Server.cc;${PROJECT_SOURCE_DIR}/gazebo/Master.cc;${PROJECT_SOURCE_DIR}/gazebo/gazebo.cc;${PROJECT_SOURCE_DIR}/test/ServerFixture.cc")
+set (GZ_BUILD_TESTS_EXTRA_EXE_SRCS "")
 gz_build_dri_tests(${dri_tests})