Merge pull request #109 from tud-zih-energy/marenz.cmake_fixes_for_roco2

CMake fixes for Roco2
tud-zih-energy · Jan 31, 2025 · ae9332c · ae9332c
2 parents 1c32c5e + ebdbd04
commit ae9332c
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 34 deletions.
diff --git a/cmake/BuildOptions.cmake b/cmake/BuildOptions.cmake
@@ -6,7 +6,7 @@ set_property(CACHE FIRESTARTER_BUILD_TYPE PROPERTY STRINGS FIRESTARTER FIRESTART
 
 # Static linking is not supported with GPU devices or MacOS.
 if(${FIRESTARTER_BUILD_TYPE} STREQUAL "FIRESTARTER" AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
-	set(FIRESTARTER_LINK_STATIC "Link FIRESTARTER as a static binary. Note, dlopen is not supported in static binaries. This option is not available on macOS or with CUDA, OneAPI or HIP enabled." ON)
+	option(FIRESTARTER_LINK_STATIC "Link FIRESTARTER as a static binary. Note, dlopen is not supported in static binaries. This option is not available on macOS or with CUDA, OneAPI or HIP enabled." ON)
 endif()
 
 
@@ -22,5 +22,5 @@ option(FIRESTARTER_FETCH_GOOGLETEST "Fetch the Google Test dependency." ON)
 
 # Debug feature are enabled on linux per default.
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-	set(FIRESTARTER_DEBUG_FEATURES "Enable debug features" ON)
+	option(FIRESTARTER_DEBUG_FEATURES "Enable debug features" ON)
 endif()
diff --git a/cmake/InstallHwloc.cmake b/cmake/InstallHwloc.cmake
@@ -68,6 +68,10 @@ if (FIRESTARTER_BUILD_HWLOC)
 		endif()
 	endif()
 
-	include_directories(${HWLOC_INCLUDE_DIR}/include)
 	add_dependencies(hwloc HwlocInstall)
+
+	# Including a non exsistant directory is not allowed. This is the case when configuring and hwloc is not yet installed.
+	# See https://gitlab.kitware.com/cmake/cmake/-/issues/15052
+	file(MAKE_DIRECTORY "${HWLOC_INCLUDE_DIR}/include")
+	target_include_directories(hwloc INTERFACE "${HWLOC_INCLUDE_DIR}/include")
 endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -30,6 +30,8 @@ add_library(firestartercore STATIC
 	firestarter/X86/Payload/SSE2Payload.cpp
 	)
 
+target_include_directories(firestartercore PUBLIC ${PROJECT_SOURCE_DIR}/include)
+
 target_link_libraries(firestartercore
 	hwloc
 	AsmJit::AsmJit
@@ -53,21 +55,46 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 		firestarter/Optimizer/Util/MultiObjective.cpp
 		firestarter/Optimizer/Algorithm/NSGA2.cpp
 		)
+
+	target_include_directories(firestarterlinux PUBLIC ${PROJECT_SOURCE_DIR}/include)
 
 	target_link_libraries(firestarterlinux
 		Nitro::log
 		nlohmann_json::nlohmann_json
 		)
 endif()
 
+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
+	)
 
-	# 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
+if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+	SET(FIRESTARTER_LIBRARIES
+		firestartercombined
+	)
+else()
+	SET(FIRESTARTER_LIBRARIES
+		"-Wl,--whole-archive"
+		firestartercombined
+		"-Wl,--no-whole-archive"
 	)
+endif()
 
 if ("${FIRESTARTER_BUILD_TYPE}" STREQUAL "FIRESTARTER_CUDA")
 	add_executable(FIRESTARTER_CUDA
@@ -76,15 +103,9 @@ if ("${FIRESTARTER_BUILD_TYPE}" STREQUAL "FIRESTARTER_CUDA")
 		)
 
 	target_link_libraries(FIRESTARTER_CUDA
-		firestartercore
+		${FIRESTARTER_LIBRARIES}
 	)
 
-	if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-		target_link_libraries(FIRESTARTER_CUDA
-			firestarterlinux
-		)
-	endif()
-
 	target_link_libraries(FIRESTARTER_CUDA
 		CUDA::cuda_driver
 		CUDA::cudart
@@ -110,15 +131,9 @@ elseif ("${FIRESTARTER_BUILD_TYPE}" STREQUAL "FIRESTARTER_ONEAPI")
 		)
 
 	target_link_libraries(FIRESTARTER_ONEAPI
-		firestartercore
+		${FIRESTARTER_LIBRARIES}
 	)
 
-	if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-		target_link_libraries(FIRESTARTER_ONEAPI
-			firestarterlinux
-		)
-	endif()
-
 	target_link_libraries(FIRESTARTER_ONEAPI
 		mkl_sycl
 		mkl_intel_ilp64
@@ -136,15 +151,9 @@ elseif("${FIRESTARTER_BUILD_TYPE}" STREQUAL "FIRESTARTER_HIP")
 		)
 
 	target_link_libraries(FIRESTARTER_HIP
-		firestartercore
+		${FIRESTARTER_LIBRARIES}
 	)
 
-	if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
-		target_link_libraries(FIRESTARTER_HIP
-			firestarterlinux
-		)
-	endif()
-
 	target_link_libraries(FIRESTARTER_HIP
 		hip::host
 		hip::hiprand
@@ -164,15 +173,9 @@ elseif(${FIRESTARTER_BUILD_TYPE} STREQUAL "FIRESTARTER")
 		)
 
 	target_link_libraries(FIRESTARTER
-		firestartercore
+		${FIRESTARTER_LIBRARIES}
 	)
 
-	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