From 35e31143a8be162d871cf8ea1f1afed4ae523188 Mon Sep 17 00:00:00 2001 From: Curro Campuzano Date: Sat, 16 May 2026 15:05:44 +0200 Subject: [PATCH 1/2] Fix CI? --- CMakeLists.txt | 32 +++----------------------------- 1 file changed, 3 insertions(+), 29 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a712ec8ba..8498927d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,29 +176,6 @@ endif() if(WIN32) set(CMAKE_CXX_STANDARD_LIBRARIES "-static-libgcc -static-libstdc++ -lwsock32 -lws2_32 ${CMAKE_CXX_STANDARD_LIBRARIES}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive") - set(GNULIB_NAMESPACE_SOURCES "${PROJECT_SOURCE_DIR}/core/chromosome.cpp" - "${PROJECT_SOURCE_DIR}/core/haplosome.cpp" - "${PROJECT_SOURCE_DIR}/core/individual.cpp" - "${PROJECT_SOURCE_DIR}/core/population.cpp" - "${PROJECT_SOURCE_DIR}/core/slim_globals.cpp" - "${PROJECT_SOURCE_DIR}/core/slim_sim_eidos.cpp" - "${PROJECT_SOURCE_DIR}/core/slim_sim.cpp" - "${PROJECT_SOURCE_DIR}/core/species.cpp" - "${PROJECT_SOURCE_DIR}/core/species_eidos.cpp" - "${PROJECT_SOURCE_DIR}/core/subpopulation.cpp" - "${PROJECT_SOURCE_DIR}/eidos/eidos_functions_files.cpp" - "${PROJECT_SOURCE_DIR}/eidos/eidos_functions_other.cpp" - "${PROJECT_SOURCE_DIR}/eidos/eidos_globals.cpp" - "${PROJECT_SOURCE_DIR}/eidos/eidos_class_DataFrame.cpp" - "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMAbout.cpp" - "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMAppDelegate.cpp" - "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMFindRecipe.cpp" - "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMGraphView.cpp" - "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMHaplotypeOptions.cpp" - "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMHelpWindow.cpp" - "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMScriptTextEdit.cpp" - "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMVariableBrowser.cpp" - "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMWindow.cpp") endif() set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -Og -DDEBUG=1") @@ -418,8 +395,7 @@ if(PARALLEL) #target_link_libraries(${TARGET_NAME_SLIM} PUBLIC omp) endif() if(WIN32) - set_source_files_properties(${SLIM_SOURCES} PROPERTIES COMPILE_FLAGS "-include config.h") - set_source_files_properties(${GNULIB_NAMESPACE_SOURCES} TARGET_DIRECTORY slim PROPERTIES COMPILE_FLAGS "-include config.h -DGNULIB_NAMESPACE=gnulib") + set_source_files_properties(${SLIM_SOURCES} PROPERTIES COMPILE_FLAGS "-include config.h -DGNULIB_NAMESPACE=gnulib") target_include_directories(${TARGET_NAME_SLIM} BEFORE PUBLIC ${GNU_DIR}) target_link_libraries(${TARGET_NAME_SLIM} PUBLIC gnu PRIVATE bcrypt) endif() @@ -440,8 +416,7 @@ if(PARALLEL) #target_link_libraries(${TARGET_NAME_EIDOS} PUBLIC omp) endif() if(WIN32) - set_source_files_properties(${EIDOS_SOURCES} PROPERTIES COMPILE_FLAGS "-include config.h") - set_source_files_properties(${GNULIB_NAMESPACE_SOURCES} TARGET_DIRECTORY slim eidos PROPERTIES COMPILE_FLAGS "-include config.h -DGNULIB_NAMESPACE=gnulib") + set_source_files_properties(${EIDOS_SOURCES} PROPERTIES COMPILE_FLAGS "-include config.h -DGNULIB_NAMESPACE=gnulib") target_include_directories(${TARGET_NAME_EIDOS} BEFORE PUBLIC ${GNU_DIR}) target_link_libraries(${TARGET_NAME_EIDOS} PUBLIC gnu PRIVATE bcrypt) endif() @@ -514,8 +489,7 @@ if(BUILD_SLIMGUI) target_link_libraries( ${TARGET_NAME_SLIMGUI} PUBLIC OpenGL::GL gsl tables eidos_zlib ) else() if(WIN32) - set_source_files_properties(${QTSLIM_SOURCES} PROPERTIES COMPILE_FLAGS "-include config.h") - set_source_files_properties(${GNULIB_NAMESPACE_SOURCES} TARGET_DIRECTORY slim eidos SLiMgui PROPERTIES COMPILE_FLAGS "-include config.h -DGNULIB_NAMESPACE=gnulib") + set_source_files_properties(${QTSLIM_SOURCES} PROPERTIES COMPILE_FLAGS "-include config.h -DGNULIB_NAMESPACE=gnulib") target_include_directories(${TARGET_NAME_SLIMGUI} BEFORE PUBLIC ${GNU_DIR}) target_link_libraries(${TARGET_NAME_SLIMGUI} PUBLIC OpenGL::GL gsl tables eidos_zlib gnu PRIVATE bcrypt) else() From 724b1ca376b38f3ed552514f6f6c4a1cb3457cab Mon Sep 17 00:00:00 2001 From: Curro Campuzano Date: Sat, 16 May 2026 17:19:59 +0200 Subject: [PATCH 2/2] Fix CI: only main.cpp? --- CMakeLists.txt | 33 ++++++++++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8498927d4..b18ad4921 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,6 +176,30 @@ endif() if(WIN32) set(CMAKE_CXX_STANDARD_LIBRARIES "-static-libgcc -static-libstdc++ -lwsock32 -lws2_32 ${CMAKE_CXX_STANDARD_LIBRARIES}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive") + set(GNULIB_NAMESPACE_SOURCES "${PROJECT_SOURCE_DIR}/core/chromosome.cpp" + "${PROJECT_SOURCE_DIR}/core/haplosome.cpp" + "${PROJECT_SOURCE_DIR}/core/individual.cpp" + "${PROJECT_SOURCE_DIR}/core/main.cpp" + "${PROJECT_SOURCE_DIR}/core/population.cpp" + "${PROJECT_SOURCE_DIR}/core/slim_globals.cpp" + "${PROJECT_SOURCE_DIR}/core/slim_sim_eidos.cpp" + "${PROJECT_SOURCE_DIR}/core/slim_sim.cpp" + "${PROJECT_SOURCE_DIR}/core/species.cpp" + "${PROJECT_SOURCE_DIR}/core/species_eidos.cpp" + "${PROJECT_SOURCE_DIR}/core/subpopulation.cpp" + "${PROJECT_SOURCE_DIR}/eidos/eidos_functions_files.cpp" + "${PROJECT_SOURCE_DIR}/eidos/eidos_functions_other.cpp" + "${PROJECT_SOURCE_DIR}/eidos/eidos_globals.cpp" + "${PROJECT_SOURCE_DIR}/eidos/eidos_class_DataFrame.cpp" + "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMAbout.cpp" + "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMAppDelegate.cpp" + "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMFindRecipe.cpp" + "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMGraphView.cpp" + "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMHaplotypeOptions.cpp" + "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMHelpWindow.cpp" + "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMScriptTextEdit.cpp" + "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMVariableBrowser.cpp" + "${PROJECT_SOURCE_DIR}/QtSLiM/QtSLiMWindow.cpp") endif() set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -Og -DDEBUG=1") @@ -395,7 +419,8 @@ if(PARALLEL) #target_link_libraries(${TARGET_NAME_SLIM} PUBLIC omp) endif() if(WIN32) - set_source_files_properties(${SLIM_SOURCES} PROPERTIES COMPILE_FLAGS "-include config.h -DGNULIB_NAMESPACE=gnulib") + set_source_files_properties(${SLIM_SOURCES} PROPERTIES COMPILE_FLAGS "-include config.h") + set_source_files_properties(${GNULIB_NAMESPACE_SOURCES} TARGET_DIRECTORY slim PROPERTIES COMPILE_FLAGS "-include config.h -DGNULIB_NAMESPACE=gnulib") target_include_directories(${TARGET_NAME_SLIM} BEFORE PUBLIC ${GNU_DIR}) target_link_libraries(${TARGET_NAME_SLIM} PUBLIC gnu PRIVATE bcrypt) endif() @@ -416,7 +441,8 @@ if(PARALLEL) #target_link_libraries(${TARGET_NAME_EIDOS} PUBLIC omp) endif() if(WIN32) - set_source_files_properties(${EIDOS_SOURCES} PROPERTIES COMPILE_FLAGS "-include config.h -DGNULIB_NAMESPACE=gnulib") + set_source_files_properties(${EIDOS_SOURCES} PROPERTIES COMPILE_FLAGS "-include config.h") + set_source_files_properties(${GNULIB_NAMESPACE_SOURCES} TARGET_DIRECTORY slim eidos PROPERTIES COMPILE_FLAGS "-include config.h -DGNULIB_NAMESPACE=gnulib") target_include_directories(${TARGET_NAME_EIDOS} BEFORE PUBLIC ${GNU_DIR}) target_link_libraries(${TARGET_NAME_EIDOS} PUBLIC gnu PRIVATE bcrypt) endif() @@ -489,7 +515,8 @@ if(BUILD_SLIMGUI) target_link_libraries( ${TARGET_NAME_SLIMGUI} PUBLIC OpenGL::GL gsl tables eidos_zlib ) else() if(WIN32) - set_source_files_properties(${QTSLIM_SOURCES} PROPERTIES COMPILE_FLAGS "-include config.h -DGNULIB_NAMESPACE=gnulib") + set_source_files_properties(${QTSLIM_SOURCES} PROPERTIES COMPILE_FLAGS "-include config.h") + set_source_files_properties(${GNULIB_NAMESPACE_SOURCES} TARGET_DIRECTORY slim eidos SLiMgui PROPERTIES COMPILE_FLAGS "-include config.h -DGNULIB_NAMESPACE=gnulib") target_include_directories(${TARGET_NAME_SLIMGUI} BEFORE PUBLIC ${GNU_DIR}) target_link_libraries(${TARGET_NAME_SLIMGUI} PUBLIC OpenGL::GL gsl tables eidos_zlib gnu PRIVATE bcrypt) else()