7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-23 07:57:51 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'main' of https://github.com/geode-sdk/geode

Browse source
This commit is contained in:
altalk23 2023-02-26 21:09:09 +03:00
commit 7c242a56b3
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
cmake/GeodeFile.cmake
View file

@ -90,7 +90,13 @@ function(setup_geode_mod proname)
endif() endif()
# Check dependencies using CLI # Check dependencies using CLI
if (${GEODE_CLI_VERSION} VERSION_GREATER_EQUAL "1.4.0") if (${GEODE_CLI_VERSION} VERSION_GREATER_EQUAL "2.0.0")
execute_process(
COMMAND ${GEODE_CLI} project check ${CMAKE_CURRENT_BINARY_DIR}
--externals ${GEODE_MODS_BEING_BUILT}
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
elseif (${GEODE_CLI_VERSION} VERSION_GREATER_EQUAL "1.4.0")
execute_process( execute_process(
COMMAND ${GEODE_CLI} package setup ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${GEODE_CLI} package setup ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
--externals ${GEODE_MODS_BEING_BUILT} --externals ${GEODE_MODS_BEING_BUILT}
@ -129,7 +135,7 @@ function(setup_geode_mod proname)
DEPENDS ${proname} ${CMAKE_CURRENT_SOURCE_DIR}/mod.json DEPENDS ${proname} ${CMAKE_CURRENT_SOURCE_DIR}/mod.json
COMMAND ${GEODE_CLI} package new ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GEODE_CLI} package new ${CMAKE_CURRENT_SOURCE_DIR}
--binary $<TARGET_FILE:${proname}> $<TARGET_LINKER_FILE:${proname}> --binary $<TARGET_FILE:${proname}> $<TARGET_LINKER_FILE:${proname}>
--output $<TARGET_FILE_DIR:${proname}>/${proname}.geode --output ${CMAKE_CURRENT_BINARY_DIR}/${MOD_ID}.geode
${INSTALL_ARG} ${INSTALL_ARG}
VERBATIM USES_TERMINAL VERBATIM USES_TERMINAL
) )
@ -138,7 +144,7 @@ function(setup_geode_mod proname)
DEPENDS ${proname} ${CMAKE_CURRENT_SOURCE_DIR}/mod.json DEPENDS ${proname} ${CMAKE_CURRENT_SOURCE_DIR}/mod.json
COMMAND ${GEODE_CLI} package new ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${GEODE_CLI} package new ${CMAKE_CURRENT_SOURCE_DIR}
--binary $<TARGET_FILE:${proname}> --binary $<TARGET_FILE:${proname}>
--output $<TARGET_FILE_DIR:${proname}>/${proname}.geode --output ${CMAKE_CURRENT_BINARY_DIR}/${MOD_ID}.geode
${INSTALL_ARG} ${INSTALL_ARG}
VERBATIM USES_TERMINAL VERBATIM USES_TERMINAL
) )