From 18a5dc706f58518548593fa48c193648e1562e85 Mon Sep 17 00:00:00 2001 From: altalk23 <45172705+altalk23@users.noreply.github.com> Date: Sun, 15 Oct 2023 19:27:00 +0300 Subject: [PATCH] remove the bandaid that no one knows what it does --- cmake/GeodeFile.cmake | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/cmake/GeodeFile.cmake b/cmake/GeodeFile.cmake index 401b46160..d4a59375b 100644 --- a/cmake/GeodeFile.cmake +++ b/cmake/GeodeFile.cmake @@ -130,27 +130,14 @@ function(setup_geode_mod proname) set(HAS_HEADERS Off) endif() - # todo: figure out how to either not make cmake shit itself and print out --binary path/to/dll "" or - # make cli not shit itself when it sees that - if (HAS_HEADERS) - add_custom_target(${proname}_PACKAGE ALL - DEPENDS ${proname} ${CMAKE_CURRENT_SOURCE_DIR}/mod.json - COMMAND ${GEODE_CLI} package new ${CMAKE_CURRENT_SOURCE_DIR} - --binary $ $ - --output ${CMAKE_CURRENT_BINARY_DIR}/${MOD_ID}.geode - ${INSTALL_ARG} - VERBATIM USES_TERMINAL - ) - else() - add_custom_target(${proname}_PACKAGE ALL - DEPENDS ${proname} ${CMAKE_CURRENT_SOURCE_DIR}/mod.json - COMMAND ${GEODE_CLI} package new ${CMAKE_CURRENT_SOURCE_DIR} - --binary $ - --output ${CMAKE_CURRENT_BINARY_DIR}/${MOD_ID}.geode - ${INSTALL_ARG} - VERBATIM USES_TERMINAL - ) - endif() + add_custom_target(${proname}_PACKAGE ALL + DEPENDS ${proname} ${CMAKE_CURRENT_SOURCE_DIR}/mod.json + COMMAND ${GEODE_CLI} package new ${CMAKE_CURRENT_SOURCE_DIR} + --binary $ + --output ${CMAKE_CURRENT_BINARY_DIR}/${MOD_ID}.geode + ${INSTALL_ARG} + VERBATIM USES_TERMINAL + ) # Add dependency dir to include path if (EXISTS "${CMAKE_CURRENT_BINARY_DIR}/geode-deps")