Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make NACL_VMS_PROJECTS accessible to outer scope #1464

Merged
merged 1 commit into from
Dec 16, 2024

Conversation

slipher
Copy link
Member

@slipher slipher commented Dec 15, 2024

Also remove duplicative nacl-vms-pexe target.

@illwieckz
Copy link
Member

illwieckz commented Dec 16, 2024

Not removing the duplicative nacl-vms-pexe target fixes Unvanquished/Unvanquished#3245 (comment)

diff --git a/cmake/DaemonGame.cmake b/cmake/DaemonGame.cmake
index 0a2f70784..c50bb6309 100644
--- a/cmake/DaemonGame.cmake
+++ b/cmake/DaemonGame.cmake
@@ -129,8 +129,9 @@ function(GAMEMODULE)
                     )
                 endforeach()
             else()
-                set(NACL_VMS_PROJECT nacl-vms)
+                set(NACL_VMS_PROJECT nacl-vms-pexe)
                 set(NACL_VMS_PROJECTS ${NACL_VMS_PROJECT})
+                add_dependencies(nacl-vms ${NACL_VMS_PROJECT})
 
                 # Workaround a bug where CMake ExternalProject lists-as-args are cut on first “;”
                 string(REPLACE ";" "," NACL_TARGETS_STRING "${NACL_TARGETS}")

@illwieckz
Copy link
Member

With that patch re-adding the separate generic nacl-vms target and toolchain-specific nacl-vms-pexe target, LGTM.

@illwieckz
Copy link
Member

illwieckz commented Dec 16, 2024

And actually I like the fact the nacl-vms target just exists to depend on the toolchain-specific targets anyway (and we may rename to no be nacl-centric, so it can be reused for wasm later).

Also remove duplicative nacl-vms-pexe target.
@slipher
Copy link
Member Author

slipher commented Dec 16, 2024

Not removing the duplicative nacl-vms-pexe target fixes Unvanquished/Unvanquished#3245 (comment)

Fixed. The Saigo-specific line creating a dummy target was mistakenly not in its if block.

Not adding back nacl-vms-pexe since there is no reason to have two names for the same target as long as the generic nacl-vms one is available.

@illwieckz
Copy link
Member

It works, you can merge it, but I will add a generic vms target that is independent to the underlying format and toolchain anyway.

@slipher slipher merged commit f1a3b06 into DaemonEngine:master Dec 16, 2024
8 of 9 checks passed
@slipher slipher deleted the naclvm-cleanup branch December 16, 2024 19:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants