Testing CI speed up, part 2

Author: chrxh

.github/workflows/copilot-setup-steps.yml

@@ -72,9 +72,6 @@ jobs:
         -DCMAKE_TOOLCHAIN_FILE=external/vcpkg/scripts/buildsystems/vcpkg.cmake
         -DCMAKE_BUILD_TYPE=Release
         -DCMAKE_CUDA_COMPILER=/usr/local/cuda/bin/nvcc
-        -DCUDAToolkit_ROOT=/usr/local/cuda
-        -DCMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH=OFF
-        -DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF
 
     - name: Build
       run: cmake --build build -j16

.github/workflows/ubuntu-ci.yml

@@ -61,9 +61,6 @@ jobs:
         -DCMAKE_TOOLCHAIN_FILE=external/vcpkg/scripts/buildsystems/vcpkg.cmake
         -DCMAKE_BUILD_TYPE=Release
         -DCMAKE_CUDA_COMPILER=/usr/local/cuda/bin/nvcc
-        -DCUDAToolkit_ROOT=/usr/local/cuda
-        -DCMAKE_FIND_USE_SYSTEM_ENVIRONMENT_PATH=OFF
-        -DCMAKE_FIND_USE_PACKAGE_REGISTRY=OFF
 
     - name: Build
       run: cmake --build build -j16

CMakeLists.txt

@@ -50,7 +50,7 @@ add_executable(EngineInterfaceTests)
 add_executable(NetworkTests)
 add_executable(PersisterTests)
 
-find_package(CUDAToolkit REQUIRED MODULE)
+#find_package(CUDAToolkit REQUIRED)
 find_package(Boost REQUIRED)
 find_package(OpenGL REQUIRED)
 find_package(GLEW REQUIRED)

source/Cli/CMakeLists.txt

@@ -8,8 +8,12 @@ target_link_libraries(cli EngineImpl)
 target_link_libraries(cli EngineInterface)
 target_link_libraries(cli PersisterInterface)
 
-target_link_libraries(cli CUDA::cudart_static)
-target_link_libraries(cli CUDA::cuda_driver)
+target_include_directories(cli
+    PRIVATE
+        ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
+)
+
+target_link_libraries(cli cudart)
 target_link_libraries(cli Boost::boost)
 target_link_libraries(cli OpenGL::GL OpenGL::GLU)
 target_link_libraries(cli GLEW::GLEW)

source/EngineImpl/CMakeLists.txt

@@ -12,8 +12,14 @@ target_link_libraries(EngineImpl Base)
 target_link_libraries(EngineImpl EngineGpuKernels)
 
 target_link_libraries(EngineImpl OpenGL::GL)
-target_link_libraries(EngineImpl CUDA::cudart_static)
 target_link_libraries(EngineImpl Boost::boost)
+target_include_directories(EngineImpl
+    PRIVATE
+        ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
+)
+
+target_link_libraries(EngineImpl cudart)
+
 
 if (MSVC)
     target_compile_options(EngineImpl PRIVATE "/MP")

source/EngineTests/CMakeLists.txt

@@ -40,8 +40,12 @@ target_link_libraries(EngineTests EngineImpl)
 target_link_libraries(EngineTests EngineInterface)
 target_link_libraries(EngineTests EngineTestData)
 
-target_link_libraries(EngineTests CUDA::cudart_static)
-target_link_libraries(EngineTests CUDA::cuda_driver)
+target_include_directories(EngineTests
+    PRIVATE
+        ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
+)
+
+target_link_libraries(EngineTests cudart)
 target_link_libraries(EngineTests Boost::boost)
 target_link_libraries(EngineTests OpenGL::GL OpenGL::GLU)
 target_link_libraries(EngineTests GLEW::GLEW)

source/Gui/CMakeLists.txt

@@ -176,9 +176,13 @@ target_link_libraries(alien Network)
 target_link_libraries(alien PersisterInterface)
 target_link_libraries(alien PersisterImpl)
 
+target_include_directories(alien
+    PRIVATE
+        ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
+)
+
+target_link_libraries(alien cudart)
 target_link_libraries(alien im_file_dialog)
-target_link_libraries(alien CUDA::cudart_static)
-target_link_libraries(alien CUDA::cuda_driver)
 target_link_libraries(alien Boost::boost)
 target_link_libraries(alien OpenGL::GL OpenGL::GLU)
 target_link_libraries(alien GLEW::GLEW)

source/PersisterTests/CMakeLists.txt

@@ -10,8 +10,12 @@ target_link_libraries(PersisterTests EngineInterface)
 target_link_libraries(PersisterTests EngineTestData)
 target_link_libraries(PersisterTests PersisterInterface)
 
-target_link_libraries(PersisterTests CUDA::cudart_static)
-target_link_libraries(PersisterTests CUDA::cuda_driver)
+target_include_directories(PersisterTests
+    PRIVATE
+        ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
+)
+
+target_link_libraries(PersisterTests cudart)
 target_link_libraries(PersisterTests Boost::boost)
 target_link_libraries(PersisterTests OpenGL::GL OpenGL::GLU)
 target_link_libraries(PersisterTests GLEW::GLEW)