From 4a2612534d1b9807960ed009f94161ad7c139e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luca=20Pep=C3=A8=20Sciarria?= Date: Fri, 28 Mar 2025 12:58:23 +0100 Subject: [PATCH] hot fix, move metis variables instantiation befor psb_config.h generation --- CMakeLists.txt | 37 +++++++++++++++++++++++++++---------- 1 file changed, 27 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 56181fd0..fd015361 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -371,10 +371,18 @@ include(${CMAKE_CURRENT_LIST_DIR}/cmake/FindMETIS.cmake) find_package(METIS) -target_link_libraries(util PUBLIC base prec) if(METIS_FOUND) message(STATUS "METIS PATH ${METIS_INCLUDES} and metis libraries ${METIS_LIBRARIES}") + # Make sure this path is correct + set(METISINCFILE "metis.h") # Adjust this to your actual path + + # Specify the configuration file + set(HEADER_TEMPLATE "${CMAKE_CURRENT_SOURCE_DIR}/util/psb_metis_int.h.in") + set(HEADER_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/include/psb_metis_int.h") + # Configure the header file + configure_file(${HEADER_TEMPLATE} ${HEADER_OUTPUT} @ONLY) + @@ -423,6 +431,10 @@ if(METIS_FOUND) add_compile_options(-DPSB_HAVE_METIS) + + + + # Determine METIS_INDEX based on real type sizes if(DEFINED PSB_METIS_REAL_32) set(METIS_INDEX 32) @@ -453,6 +465,20 @@ if(METIS_FOUND) set(CINTMETIS "#define PSB_METIS_${IPK_SIZE}") set(CREALMETIS "#define PSB_METIS_REAL_${LPK_SIZE}") + + + + + target_include_directories(util + PUBLIC ${METIS_INCLUDES}) + target_include_directories(psb_util_C + PUBLIC ${METIS_INCLUDES}) + target_link_libraries(util + PUBLIC ${METIS_LIBRARIES}) + target_compile_definitions(psb_util_C + PUBLIC PSB_HAVE_METIS) #TDDO: CHECK IF THAT _ IS CORRECT + target_compile_definitions(util + PUBLIC PSB_HAVE_METIS) endif() @@ -746,16 +772,7 @@ target_include_directories(util PUBLIC target_link_libraries(util PUBLIC base prec) if(METIS_FOUND) - # Make sure this path is correct - set(METISINCFILE "metis.h") # Adjust this to your actual path - # Specify the configuration file - set(HEADER_TEMPLATE "${CMAKE_CURRENT_SOURCE_DIR}/util/psb_metis_int.h.in") - set(HEADER_OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/include/psb_metis_int.h") - - # Configure the header file - configure_file(${HEADER_TEMPLATE} ${HEADER_OUTPUT} @ONLY) - target_include_directories(util PUBLIC ${METIS_INCLUDES}) target_include_directories(psb_util_C