Use new cmake and precompiled headers

.gitlab-ci.yml

@@ -28,9 +28,9 @@ linux:
   script:
     - mkdir build
     - cd build
-    - cmake .. -DCMAKE_CXX_FLAGS="-fdiagnostics-color" -DWITH_OPTFLOW=TRUE -DUSE_CPPCHECK=FALSE -DBUILD_CALIBRATION=TRUE -DWITH_CERES=TRUE -DCMAKE_BUILD_TYPE=Release -DCPACK_GENERATOR=DEB
-    - make
-    - make package
+    - /snap/bin/cmake .. -GNinja -DCMAKE_CXX_FLAGS="-fdiagnostics-color" -DWITH_OPTFLOW=TRUE -DUSE_CPPCHECK=FALSE -DBUILD_CALIBRATION=TRUE -DWITH_CERES=TRUE -DCMAKE_BUILD_TYPE=Release -DCPACK_GENERATOR=DEB
+    - ninja
+    - ninja package
     - ctest --output-on-failure
     - cd ../SDK/Python
     - python3 -m unittest discover test

CMakeLists.txt

-cmake_minimum_required (VERSION 3.1.0)
+cmake_minimum_required (VERSION 3.16.0)
 include (CheckIncludeFile)
 include (CheckIncludeFileCXX)
 include (CheckFunctionExists)

applications/tools/middlebury_gen/CMakeLists.txt

@@ -15,3 +15,4 @@ endif()
 
 #target_include_directories(cv-node PUBLIC ${PROJECT_SOURCE_DIR}/include)
 target_link_libraries(middlebury-gen ftlcommon ftlrgbd Threads::Threads ${OpenCV_LIBS} ftlrender ftloperators ftlstreams)
+set_property(TARGET middlebury-gen PROPERTY CUDA_ARCHITECTURES OFF)

components/codecs/CMakeLists.txt

@@ -14,6 +14,7 @@ target_include_directories(BaseCodec PUBLIC
 	${CMAKE_CURRENT_SOURCE_DIR}/src/Video_Codec_SDK_9.1.23/Samples/NvCodec
 	$<TARGET_PROPERTY:ftlcommon,INTERFACE_INCLUDE_DIRECTORIES>
 )
+set_property(TARGET BaseCodec PROPERTY CUDA_ARCHITECTURES OFF)
 
 add_library(OpenCVCodec OBJECT	
 	src/opencv_encoder.cpp

components/codecs/test/CMakeLists.txt

@@ -39,6 +39,8 @@ ${CMAKE_CURRENT_SOURCE_DIR}/../src/Video_Codec_SDK_9.1.23/Samples/NvCodec)
 target_link_libraries(nvidia_codec_unit
 	Threads::Threads ${OS_LIBS} ${OpenCV_LIBS} ${CUDA_LIBRARIES} ftlcommon nvcuvid cuda)
 
+set_property(TARGET nvidia_codec_unit PROPERTY CUDA_ARCHITECTURES OFF)
+
 
 add_test(NvidiaCodecUnitTest nvidia_codec_unit)
 

components/common/cpp/CMakeLists.txt

@@ -29,6 +29,12 @@ target_include_directories(ftlcommon PUBLIC
 	PRIVATE src)
 target_link_libraries(ftlcommon Threads::Threads Eigen3::Eigen ${OS_LIBS} ${OpenCV_LIBS} ${URIPARSER_LIBRARIES} ${CUDA_LIBRARIES})
 
+target_precompile_headers(ftlcommon
+	PRIVATE include/ftl/utility/msgpack.hpp
+	PRIVATE include/ftl/utility/msgpack_optional.hpp
+	PRIVATE include/ftl/cuda_common.hpp
+)
+
 if (BUILD_TESTS)
 add_subdirectory(test)
 endif()

components/operators/CMakeLists.txt

@@ -57,6 +57,8 @@ target_include_directories(ftloperators PUBLIC
 
 target_link_libraries(ftloperators ftlrender ftlrgbd ftlcommon sgm libstereo Eigen3::Eigen Threads::Threads ${OpenCV_LIBS})
 
+set_property(TARGET ftloperators PROPERTY CUDA_ARCHITECTURES OFF)
+
 if (BUILD_TESTS)
 	add_subdirectory(test)
 endif()

components/renderers/cpp/CMakeLists.txt

@@ -29,4 +29,6 @@ target_include_directories(ftlrender PUBLIC
 	PRIVATE src)
 target_link_libraries(ftlrender ftlrgbd ftlcommon Eigen3::Eigen Threads::Threads nanogui ${NANOGUI_EXTRA_LIBS} ${OpenCV_LIBS})
 
+set_property(TARGET ftlrender PROPERTY CUDA_ARCHITECTURES OFF)
+
 #ADD_SUBDIRECTORY(test)

components/structures/CMakeLists.txt

@@ -6,6 +6,11 @@ target_include_directories(ftldata PUBLIC
 
 target_link_libraries(ftldata ftlcommon Eigen3::Eigen ftlcodecs)
 
+target_precompile_headers(ftldata
+	PRIVATE include/ftl/data/new_frame.hpp
+	PRIVATE include/ftl/data/new_frameset.hpp
+)
+
 if (BUILD_TESTS)
 add_subdirectory(test)
 endif()

lib/libstereo/CMakeLists.txt

@@ -119,6 +119,7 @@ endif()
 target_include_directories(libstereo PRIVATE src/ include/)
 target_include_directories(libstereo PUBLIC ${OpenCV_INCLUDE_DIRS})
 target_link_libraries(libstereo Threads::Threads ${OpenCV_LIBS} ${CUDA_LIBRARIES})
+set_property(TARGET libstereo PROPERTY CUDA_ARCHITECTURES OFF)
 
 if (BUILD_MIDDLEBURY)
     add_subdirectory(middlebury/)

lib/libstereo/test/CMakeLists.txt

@@ -7,6 +7,7 @@ $<TARGET_OBJECTS:CatchTest>
 target_include_directories(dsi_cpu_unit PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../include")
 target_include_directories(dsi_cpu_unit PUBLIC ${OpenCV_INCLUDE_DIRS})
 target_link_libraries(dsi_cpu_unit Threads::Threads ${OpenCV_LIBS})
+#set_property(TARGET dsi_cpu_unit PROPERTY CUDA_ARCHITECTURES OFF)
 
 add_test(DSICPUUnitTest dsi_cpu_unit)
 
@@ -18,6 +19,7 @@ target_include_directories(dsi_gpu_unit PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../i
 target_include_directories(dsi_gpu_unit PUBLIC ${OpenCV_INCLUDE_DIRS})
 target_compile_definitions(dsi_gpu_unit PUBLIC USE_GPU)
 target_link_libraries(dsi_gpu_unit Threads::Threads ${OpenCV_LIBS})
+set_property(TARGET dsi_gpu_unit PROPERTY CUDA_ARCHITECTURES OFF)
 
 add_test(DSIGPUUnitTest dsi_gpu_unit)
 
@@ -28,6 +30,7 @@ $<TARGET_OBJECTS:CatchTest>
 target_include_directories(array2d_unit PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../include")
 target_include_directories(array2d_unit PUBLIC ${OpenCV_INCLUDE_DIRS})
 target_link_libraries(array2d_unit Threads::Threads ${OpenCV_LIBS})
+set_property(TARGET array2d_unit PROPERTY CUDA_ARCHITECTURES OFF)
 
 add_test(Array2DUnitTest array2d_unit)
 
@@ -41,6 +44,7 @@ $<TARGET_OBJECTS:CatchTest>
 target_include_directories(matching_cost_unit PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../include" "${CMAKE_CURRENT_SOURCE_DIR}/../src")
 target_include_directories(matching_cost_unit PUBLIC ${OpenCV_INCLUDE_DIRS})
 target_link_libraries(matching_cost_unit Threads::Threads ${OpenCV_LIBS})
+set_property(TARGET matching_cost_unit PROPERTY CUDA_ARCHITECTURES OFF)
 
 add_test(MatchingCostUnitTest matching_cost_unit)
 
@@ -51,6 +55,7 @@ $<TARGET_OBJECTS:CatchTest>
 target_include_directories(aggregation_unit PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../include")
 target_include_directories(aggregation_unit PUBLIC ${OpenCV_INCLUDE_DIRS})
 target_link_libraries(aggregation_unit Threads::Threads ${OpenCV_LIBS})
+set_property(TARGET aggregation_unit PROPERTY CUDA_ARCHITECTURES OFF)
 
 add_test(AggregationUnitTest aggregation_unit)
 
@@ -61,5 +66,6 @@ $<TARGET_OBJECTS:CatchTest>
 target_include_directories(wta_unit PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../include")
 target_include_directories(wta_unit PUBLIC ${OpenCV_INCLUDE_DIRS})
 target_link_libraries(wta_unit Threads::Threads ${OpenCV_LIBS})
+set_property(TARGET wta_unit PROPERTY CUDA_ARCHITECTURES OFF)
 
 add_test(WTAUnitTest wta_unit)