From f669a1c25851a03ff764e765ad12d8f4a25ffe21 Mon Sep 17 00:00:00 2001 From: Markus Schmidl Date: Fri, 24 Jan 2025 19:43:38 +0100 Subject: [PATCH] create combined firestarter library --- src/CMakeLists.txt | 52 ++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 32 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 35dc000b..c09a3298 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -64,13 +64,25 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux") ) endif() - -SET(FIRESTARTER_FILES - firestarter/Main.cpp - +add_library(firestartercombined STATIC # IpcEstimateMetricData::insertValue is accesses which is part of the firestarterlinux library. # This reference should be removed there and the file moved back to the firestartercore library. firestarter/LoadWorker.cpp +) + +target_link_libraries(firestartercombined + firestartercore + ) + +if(CMAKE_SYSTEM_NAME STREQUAL "Linux") + target_link_libraries(firestartercombined + firestarterlinux + ) +endif() + + +SET(FIRESTARTER_FILES + firestarter/Main.cpp ) if ("${FIRESTARTER_BUILD_TYPE}" STREQUAL "FIRESTARTER_CUDA") @@ -80,15 +92,9 @@ if ("${FIRESTARTER_BUILD_TYPE}" STREQUAL "FIRESTARTER_CUDA") ) target_link_libraries(FIRESTARTER_CUDA - firestartercore + firestartercombined ) - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - target_link_libraries(FIRESTARTER_CUDA - firestarterlinux - ) - endif() - target_link_libraries(FIRESTARTER_CUDA CUDA::cuda_driver CUDA::cudart @@ -114,15 +120,9 @@ elseif ("${FIRESTARTER_BUILD_TYPE}" STREQUAL "FIRESTARTER_ONEAPI") ) target_link_libraries(FIRESTARTER_ONEAPI - firestartercore + firestartercombined ) - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - target_link_libraries(FIRESTARTER_ONEAPI - firestarterlinux - ) - endif() - target_link_libraries(FIRESTARTER_ONEAPI mkl_sycl mkl_intel_ilp64 @@ -140,15 +140,9 @@ elseif("${FIRESTARTER_BUILD_TYPE}" STREQUAL "FIRESTARTER_HIP") ) target_link_libraries(FIRESTARTER_HIP - firestartercore + firestartercombined ) - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - target_link_libraries(FIRESTARTER_HIP - firestarterlinux - ) - endif() - target_link_libraries(FIRESTARTER_HIP hip::host hip::hiprand @@ -168,15 +162,9 @@ elseif(${FIRESTARTER_BUILD_TYPE} STREQUAL "FIRESTARTER") ) target_link_libraries(FIRESTARTER - firestartercore + firestartercombined ) - if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - target_link_libraries(FIRESTARTER - firestarterlinux - ) - endif() - target_link_libraries_darwin(NAME FIRESTARTER) # static linking is not supported on Darwin, see Apple Technical QA1118