remove targets containing headers only file

Summary: Some versions of compilers, linkers and cmake have issues with these targets (eg. in OSX) Reviewed By: siyengar Differential Revision: D15196667 fbshipit-source-id: 5f955cbb1bcf12e67db37968131d9dccf5684bc9
facebook · May 3, 2019 · cac8669 · cac8669
1 parent 4ed2963
commit cac8669
Show file tree

Hide file tree

Showing 19 changed files with 1 addition and 233 deletions.
diff --git a/quic/api/CMakeLists.txt b/quic/api/CMakeLists.txt
@@ -35,7 +35,6 @@ add_dependencies(
   mvfst_exception
   mvfst_flowcontrol
   mvfst_happyeyeballs
-  mvfst_logging
   mvfst_looper
   mvfst_loss
   mvfst_state_functions
@@ -59,7 +58,6 @@ target_link_libraries(
   mvfst_exception
   mvfst_flowcontrol
   mvfst_happyeyeballs
-  mvfst_logging
   mvfst_looper
   mvfst_loss
   mvfst_state_functions

diff --git a/quic/api/test/CMakeLists.txt b/quic/api/test/CMakeLists.txt
@@ -7,47 +7,12 @@ if(NOT BUILD_TESTS)
   return()
 endif()
 
-add_library(mvfst_mock_socket STATIC
-  MockQuicSocket.h
-  MockQuicStats.h
-  Mocks.h
-)
-
-target_include_directories(
-  mvfst_mock_socket PUBLIC
-  $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-)
-
-add_dependencies(
-  mvfst_mock_socket
-  mvfst_exception
-  mvfst_transport
-  mvfst_codec_types
-  mvfst_server
-  mvfst_state_machine
-  mvfst_state_stats_callback
-)
-
-target_link_libraries(
-  mvfst_mock_socket PUBLIC
-  Folly::folly
-  mvfst_exception
-  mvfst_transport
-  mvfst_codec_types
-  mvfst_server
-  mvfst_state_machine
-  mvfst_state_stats_callback
-  ${LIBGMOCK_LIBRARIES}
-)
-
 quic_add_test(TARGET QuicTransportTest
   SOURCES
   QuicTransportTest.cpp
   DEPENDS
   Folly::folly
   mvfst_transport
-  mvfst_mock_socket
-  mvfst_mock_state
   mvfst_server
   mvfst_state_stream_functions
   mvfst_test_utils
@@ -60,8 +25,6 @@ quic_add_test(TARGET QuicTransportBaseTest
   DEPENDS
   Folly::folly
   mvfst_transport
-  mvfst_mock_socket
-  mvfst_mock_state
   mvfst_codec_types
   mvfst_test_utils
   mvfst_state_stream_functions
@@ -75,8 +38,6 @@ quic_add_test(TARGET QuicTransportFunctionsTest
   DEPENDS
   Folly::folly
   mvfst_transport
-  mvfst_mock_socket
-  mvfst_mock_state
   mvfst_test_utils
   mvfst_server
   ${LIBGTEST_LIBRARY}
@@ -90,7 +51,6 @@ quic_add_test(TARGET QuicPacketSchedulerTest
   mvfst_client
   mvfst_codec_pktbuilder
   mvfst_transport
-  mvfst_mock_socket
   mvfst_test_utils
   mvfst_server
   ${LIBGTEST_LIBRARY}

diff --git a/quic/client/test/CMakeLists.txt b/quic/client/test/CMakeLists.txt
@@ -17,8 +17,6 @@ quic_add_test(TARGET QuicClientTransportTest
   mvfst_codec_types
   mvfst_echohandler
   mvfst_handshake
-  mvfst_mock_socket
-  mvfst_mock_state
   mvfst_server
   mvfst_test_utils
   mvfst_transport

diff --git a/quic/codec/CMakeLists.txt b/quic/codec/CMakeLists.txt
@@ -194,7 +194,6 @@ add_dependencies(
   mvfst_codec_pktbuilder
   mvfst_exception
   mvfst_handshake
-  mvfst_state_ack_states
 )
 
 target_link_libraries(
@@ -205,7 +204,6 @@ target_link_libraries(
   mvfst_codec_types
   mvfst_exception
   mvfst_handshake
-  mvfst_state_ack_states
 )
 
 file(

diff --git a/quic/common/test/CMakeLists.txt b/quic/common/test/CMakeLists.txt
@@ -32,7 +32,6 @@ add_dependencies(
   mvfst_codec_types
   mvfst_handshake
   mvfst_server
-  mvfst_state_ack_states
   mvfst_state_machine
   mvfst_transport
 )
@@ -46,7 +45,6 @@ target_link_libraries(
   mvfst_codec_types
   mvfst_handshake
   mvfst_server
-  mvfst_state_ack_states
   mvfst_state_machine
   mvfst_transport
   PRIVATE
@@ -68,7 +66,6 @@ quic_add_test(TARGET QuicCommonUtilTest SOURCES
   mvfst_looper
   mvfst_transport
   mvfst_server
-  mvfst_state_ack_states
   mvfst_state_machine
   mvfst_test_utils
   ${BOOST_LIBRARIES}

diff --git a/quic/congestion_control/CMakeLists.txt b/quic/congestion_control/CMakeLists.txt
@@ -28,7 +28,6 @@ add_dependencies(
   mvfst_cc_algo
   mvfst_constants
   mvfst_exception
-  mvfst_logging
   mvfst_state_machine
   mvfst_state_functions
 )
@@ -39,7 +38,6 @@ target_link_libraries(
   fizz::fizz
   mvfst_constants
   mvfst_exception
-  mvfst_logging
   mvfst_state_machine
   mvfst_state_functions
 )

diff --git a/quic/flowcontrol/CMakeLists.txt b/quic/flowcontrol/CMakeLists.txt
@@ -25,7 +25,6 @@ add_dependencies(
   mvfst_constants
   mvfst_exception
   mvfst_codec_types
-  mvfst_logging
   mvfst_state_machine
 )
 
@@ -35,7 +34,6 @@ target_link_libraries(
   mvfst_codec_types
   mvfst_constants
   mvfst_exception
-  mvfst_logging
   mvfst_state_machine
 )
 

diff --git a/quic/flowcontrol/test/CMakeLists.txt b/quic/flowcontrol/test/CMakeLists.txt
@@ -14,7 +14,6 @@ quic_add_test(TARGET QuicFlowControlTest
   Folly::folly
   mvfst_client
   mvfst_flowcontrol
-  mvfst_mock_socket
   mvfst_test_utils
   ${LIBGTEST_LIBRARY}
 )
diff --git a/quic/handshake/test/CMakeLists.txt b/quic/handshake/test/CMakeLists.txt
@@ -19,7 +19,6 @@ target_include_directories(
 target_link_libraries(
   quic_mock_handshake PUBLIC
   Folly::folly
-  mvfst_state_stats_callback
   ${LIBGMOCK_LIBRARIES}
   ${LIBGTEST_LIBRARY}
 )

diff --git a/quic/happyeyeballs/CMakeLists.txt b/quic/happyeyeballs/CMakeLists.txt
@@ -22,15 +22,13 @@ target_compile_options(
 
 add_dependencies(
   mvfst_happyeyeballs
-  mvfst_logging
   mvfst_state_machine
 )
 
 target_link_libraries(
   mvfst_happyeyeballs PUBLIC
   Folly::folly
   fizz::fizz
-  mvfst_logging
   mvfst_state_machine
 )
 

diff --git a/quic/logging/CMakeLists.txt b/quic/logging/CMakeLists.txt
@@ -3,36 +3,6 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-add_library(
-  mvfst_logging STATIC
-  QuicLogger.h
-)
-
-target_include_directories(
-  mvfst_logging PUBLIC
-  $<BUILD_INTERFACE:${QUIC_FBCODE_ROOT}>
-  $<INSTALL_INTERFACE:include/>
-)
-
-target_compile_options(
-  mvfst_logging
-  PRIVATE
-  ${_QUIC_COMMON_COMPILE_OPTIONS}
-)
-
-add_dependencies(
-  mvfst_logging
-  mvfst_codec_types
-  mvfst_state_machine
-)
-
-target_link_libraries(
-  mvfst_logging PUBLIC
-  Folly::folly
-  mvfst_codec_types
-  mvfst_state_machine
-)
-
 file(
   GLOB_RECURSE QUIC_API_HEADERS_TOINSTALL
   RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
@@ -44,10 +14,4 @@ foreach(header ${QUIC_API_HEADERS_TOINSTALL})
   install(FILES ${header} DESTINATION include/quic/logging/${header_dir})
 endforeach()
 
-install(
-  TARGETS mvfst_logging
-  EXPORT mvfst-exports
-  DESTINATION lib
-)
-
 add_subdirectory(test)
diff --git a/quic/logging/test/CMakeLists.txt b/quic/logging/test/CMakeLists.txt
@@ -12,6 +12,6 @@ quic_add_test(TARGET MacroTest
   QuicLoggingMacroTest.cpp
   DEPENDS
   Folly::folly
-  mvfst_logging
   ${LIBGTEST_LIBRARY}
+  mvfst_state_functions
 )
diff --git a/quic/loss/CMakeLists.txt b/quic/loss/CMakeLists.txt
@@ -26,7 +26,6 @@ add_dependencies(
   mvfst_constants
   mvfst_exception
   mvfst_flowcontrol
-  mvfst_logging
   mvfst_state_functions
   mvfst_state_machine
   mvfst_state_simple_frame_functions
@@ -39,7 +38,6 @@ target_link_libraries(
   mvfst_constants
   mvfst_exception
   mvfst_flowcontrol
-  mvfst_logging
   mvfst_state_functions
   mvfst_state_machine
   mvfst_state_simple_frame_functions

diff --git a/quic/loss/test/CMakeLists.txt b/quic/loss/test/CMakeLists.txt
@@ -15,8 +15,6 @@ quic_add_test(TARGET QuicLossFunctionsTest
   mvfst_codec_types
   mvfst_client
   mvfst_loss
-  mvfst_mock_socket
-  mvfst_mock_state
   mvfst_server
   mvfst_test_utils
   mvfst_transport

diff --git a/quic/samples/CMakeLists.txt b/quic/samples/CMakeLists.txt
@@ -31,7 +31,6 @@ target_link_libraries(
   mvfst_echohandler PUBLIC
   Folly::folly
   fizz::fizz
-  mvfst_logging
   mvfst_transport
   mvfst_client
   mvfst_test_utils

diff --git a/quic/server/CMakeLists.txt b/quic/server/CMakeLists.txt
@@ -34,7 +34,6 @@ add_dependencies(
   mvfst_codec
   mvfst_codec_types
   mvfst_handshake
-  mvfst_state_stats_callback
   mvfst_transport
 )
 
@@ -46,7 +45,6 @@ target_link_libraries(
   mvfst_codec
   mvfst_codec_types
   mvfst_handshake
-  mvfst_state_stats_callback
   mvfst_transport
 )
 

diff --git a/quic/server/test/CMakeLists.txt b/quic/server/test/CMakeLists.txt
@@ -16,7 +16,6 @@ quic_add_test(TARGET QuicServerTest
   mvfst_codec
   mvfst_codec_types
   mvfst_echohandler
-  mvfst_mock_socket
   mvfst_server
   mvfst_test_utils
   mvfst_transport
@@ -31,7 +30,6 @@ quic_add_test(TARGET QuicServerTransportTest
   mvfst_codec_pktbuilder
   mvfst_codec_types
   mvfst_handshake
-  mvfst_mock_socket
   mvfst_server
   mvfst_state_stream_functions
   mvfst_test_utils