mirror of
https://git.citron-emu.org/citron/emulator
synced 2026-01-07 02:13:53 +00:00
Merge branch 'boost_process_fix' into 'main'
fix: defer Boost.Process compile definition to after core target creation See merge request citron/emulator!74
This commit is contained in:
@@ -312,8 +312,8 @@ find_package(Boost 1.79.0 REQUIRED COMPONENTS context OPTIONAL_COMPONENTS proces
|
||||
|
||||
# Check if the optional 'process' component was successfully found.
|
||||
if(Boost_PROCESS_FOUND)
|
||||
# It was found, so we add a compile definition to enable it in the C++ source.
|
||||
target_compile_definitions(core PRIVATE HAS_BOOST_PROCESS)
|
||||
# Note: We'll set this definition later when the core target is created
|
||||
set(HAS_BOOST_PROCESS_DEFINITION "HAS_BOOST_PROCESS")
|
||||
message(STATUS "Found optional Boost.Process, enabling advanced debugger pipe.")
|
||||
else()
|
||||
# It was not found. This is not an error.
|
||||
@@ -717,6 +717,11 @@ endif()
|
||||
|
||||
add_subdirectory(src)
|
||||
|
||||
# Apply the Boost.Process definition to the core target if it was found
|
||||
if(DEFINED HAS_BOOST_PROCESS_DEFINITION)
|
||||
target_compile_definitions(core PRIVATE ${HAS_BOOST_PROCESS_DEFINITION})
|
||||
endif()
|
||||
|
||||
# Set citron project or citron-cmd project as default StartUp Project in Visual Studio depending on whether QT is enabled or not
|
||||
if(ENABLE_QT)
|
||||
set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PROPERTY VS_STARTUP_PROJECT citron)
|
||||
|
||||
Reference in New Issue
Block a user