Revert "use unity builds"

This reverts commit 6bf4fc7.
tritonuas · Apr 18, 2024 · 664bbc8 · 664bbc8
1 parent 6bf4fc7
commit 664bbc8
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 61 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -11,11 +11,11 @@ FATAL: In-source builds are not allowed.
 endif()
 
 # enable build caching
-# find_program(CCACHE ccache)
-# if(CCACHE)
-#     set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE})
-#     set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
-# endif(CCACHE)
+find_program(CCACHE ccache)
+if(CCACHE)
+    set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE})
+    set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE})
+endif(CCACHE)
 
 set(CMAKE_CXX_COMPILER g++)
 set(CMAKE_CXX_STANDARD 20)
@@ -100,10 +100,6 @@ add_definitions( -DMAGICKCORE_HDRI_ENABLE=0 )
 find_package(ImageMagick COMPONENTS Magick++ REQUIRED)
 # =============================
 
-function(set_unity_for_target target_name)
-  set_target_properties(${target_name} PROPERTIES UNITY_BUILD ON UNITY_BUILD_MODE BATCH UNITY_BUILD_BATCH_SIZE 16 UNITY_BUILD_UNIQUE_ID "MY_UNITY_ID")
-endfunction()
-
 # =============================
 # obcpp library & executable
 

diff --git a/protos b/protos
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -1,5 +1,3 @@
-add_library(obcpp_protos STATIC ${PROJECT_SOURCE_DIR}/build/gen_protos/protos/obc.pb.cc)
-
 add_subdirectory(camera)
 add_subdirectory(core)
 add_subdirectory(cv)
@@ -10,7 +8,6 @@ add_subdirectory(utilities)
 
 add_library(obcpp_lib INTERFACE)
 target_link_libraries(obcpp_lib INTERFACE
-    obcpp_protos
     obcpp_camera
     obcpp_core
     obcpp_cv
@@ -23,7 +20,6 @@ target_link_libraries(obcpp_lib INTERFACE
 # for use in unit tests
 add_library(obcpp_lib_mock INTERFACE)
 target_link_libraries(obcpp_lib_mock INTERFACE
-    obcpp_protos
     obcpp_camera
     obcpp_core
     obcpp_cv

diff --git a/src/camera/CMakeLists.txt b/src/camera/CMakeLists.txt
@@ -5,20 +5,10 @@ set(FILES
     mock.cpp
 )
 
-SET(LIB_DEPS
-    obcpp_protos
-)
-
-add_library(${LIB_NAME} STATIC
+add_library(${LIB_NAME} STATIC ${PROJECT_SOURCE_DIR}/build/gen_protos/protos/obc.pb.cc
     ${FILES}
 )
 
-target_link_libraries(${LIB_NAME} PRIVATE
-    ${LIB_DEPS}
-)
-
-set_unity_for_target(${LIB_NAME})
-
 target_add_protobuf(${LIB_NAME})
 target_add_torch(${LIB_NAME})
 # target_add_arena(${LIB_NAME}) # Tyler: currently broken, so we had to comment this out

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -7,7 +7,6 @@ set(FILES
 )
 
 set(LIB_DEPS
-    obcpp_protos
     obcpp_camera
     obcpp_cv
     obcpp_network
@@ -16,16 +15,14 @@ set(LIB_DEPS
     obcpp_utilities
 )
 
-add_library(${LIB_NAME} STATIC
+add_library(${LIB_NAME} STATIC ${PROJECT_SOURCE_DIR}/build/gen_protos/protos/obc.pb.cc
     ${FILES}
 )
 
 target_link_libraries(${LIB_NAME} PRIVATE
     ${LIB_DEPS}
 )
 
-set_unity_for_target(${LIB_NAME})
-
 target_add_protobuf(${LIB_NAME})
 target_add_torch(${LIB_NAME})
 # target_add_arena(${LIB_NAME}) # Tyler: currently broken, so we had to comment this out

diff --git a/src/cv/CMakeLists.txt b/src/cv/CMakeLists.txt
@@ -11,21 +11,14 @@ set(FILES
     utilities.cpp
 )
 
-set(LIB_DEPS
-    obcpp_protos
-    obcpp_utilities
-)
-
-add_library(${LIB_NAME} STATIC
+add_library(${LIB_NAME} STATIC ${PROJECT_SOURCE_DIR}/build/gen_protos/protos/obc.pb.cc
     ${FILES}
 )
 
 target_link_libraries(${LIB_NAME} PRIVATE
-    ${LIB_DEPS}
+    obcpp_utilities
 )
 
-set_unity_for_target(${LIB_NAME})
-
 target_add_protobuf(${LIB_NAME})
 target_add_torch(${LIB_NAME})
 # target_add_arena(${LIB_NAME}) # Tyler: currently broken, so we had to comment this out

diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
@@ -19,23 +19,20 @@ set(MOCK_FILES
 )
 
 set(LIB_DEPS
-    obcpp_protos
     obcpp_utilities
     obcpp_ticks
     obcpp_core
     obcpp_pathing
 )
 
-add_library(${LIB_NAME} STATIC
+add_library(${LIB_NAME} STATIC ${PROJECT_SOURCE_DIR}/build/gen_protos/protos/obc.pb.cc
     ${FILES}
 )
 
 target_link_libraries(${LIB_NAME} PRIVATE
     ${LIB_DEPS}
 )
 
-set_unity_for_target(${LIB_NAME})
-
 target_add_protobuf(${LIB_NAME})
 target_add_torch(${LIB_NAME})
 # target_add_arena(${LIB_NAME}) # Tyler: currently broken, so we had to comment this out

diff --git a/src/pathing/CMakeLists.txt b/src/pathing/CMakeLists.txt
@@ -9,20 +9,17 @@ set(FILES
 )
 
 set (LIB_DEPS
-    obcpp_protos
     obcpp_core
     obcpp_network
     obcpp_utilities
 )
 
-add_library(${LIB_NAME} STATIC
+add_library(${LIB_NAME} STATIC ${PROJECT_SOURCE_DIR}/build/gen_protos/protos/obc.pb.cc
     ${FILES}
 )
 
 target_link_libraries(${LIB_NAME} PRIVATE ${LIB_DEPS})
 
-set_unity_for_target(${LIB_NAME})
-
 target_add_protobuf(${LIB_NAME})
 target_add_torch(${LIB_NAME})
 # target_add_arena(${LIB_NAME}) # Tyler: currently broken, so we had to comment this out

diff --git a/src/ticks/CMakeLists.txt b/src/ticks/CMakeLists.txt
@@ -17,23 +17,20 @@ set(FILES
 )
 
 set(LIB_DEPS
-    obcpp_protos
     obcpp_pathing
     obcpp_utilities
     obcpp_core
     obcpp_network
 )
 
-add_library(${LIB_NAME} STATIC
+add_library(${LIB_NAME} STATIC ${PROJECT_SOURCE_DIR}/build/gen_protos/protos/obc.pb.cc
     ${FILES}
 )
 
 target_link_libraries(${LIB_NAME} PRIVATE
     ${LIB_DEPS}
 )
 
-set_unity_for_target(${LIB_NAME})
-
 target_add_protobuf(${LIB_NAME})
 target_add_torch(${LIB_NAME})
 # target_add_arena(${LIB_NAME}) # Tyler: currently broken, so we had to comment this out

diff --git a/src/utilities/CMakeLists.txt b/src/utilities/CMakeLists.txt
@@ -8,20 +8,10 @@ SET(FILES
     rng.cpp
 )
 
-SET(LIB_DEPS
-    obcpp_protos
-)
-
-add_library(${LIB_NAME} STATIC
+add_library(${LIB_NAME} STATIC ${PROJECT_SOURCE_DIR}/build/gen_protos/protos/obc.pb.cc
     ${FILES}
 )
 
-target_link_libraries(${LIB_NAME} PRIVATE
-    ${LIB_DEPS}
-)
-
-set_unity_for_target(${LIB_NAME})
-
 target_add_protobuf(${LIB_NAME})
 target_add_torch(${LIB_NAME})
 # target_add_arena(${LIB_NAME}) # Tyler: currently broken, so we had to comment this out