Skip to content

cmake: Use CMAKE_CURRENT_SOURCE_DIR to allow lute to build against slua #113

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.

Sign up for GitHub

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

Open
tapple wants to merge 1 commit into
base: main
Choose a base branch
from
Open

cmake: Use CMAKE_CURRENT_SOURCE_DIR to allow lute to build against slua #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,10 @@ if(LUAU_SANITIZE)
endif()

# Embed builtins.txt into a header file at configure time
file(READ "${CMAKE_SOURCE_DIR}/builtins.txt" BUILTINS_HEX HEX)
file(READ "${CMAKE_CURRENT_SOURCE_DIR}/builtins.txt" BUILTINS_HEX HEX)
string(REGEX REPLACE "([0-9a-f][0-9a-f])" "0x\\1, " BUILTINS_HEX_ARRAY "${BUILTINS_HEX}")
configure_file(
"${CMAKE_SOURCE_DIR}/LSLBuiltins/src/builtins_embedded.h.in"
"${CMAKE_CURRENT_SOURCE_DIR}/LSLBuiltins/src/builtins_embedded.h.in"
"${CMAKE_BINARY_DIR}/builtins_embedded.h"

@HaroldCindy HaroldCindy Nov 10, 2026

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This (and the other CMAKE_BINARY_DIR instance should also be CMAKE_CURRENT_BINARY_DIR so we don't pollute the root project's build dir

@ONLY
)
Expand Down Expand Up @@ -329,8 +329,8 @@ endif()
# ServerLua: GCC doesn't support the FP_CONTRACT pragma, so we have to use this to tell it it not to
# fuse multiply and add for these files.
set(FP_SENSITIVE_SOURCE_FILES
${CMAKE_SOURCE_DIR}/VM/src/lll.cpp
${CMAKE_SOURCE_DIR}/VM/src/llsl.cpp
${CMAKE_CURRENT_SOURCE_DIR}/VM/src/lll.cpp
${CMAKE_CURRENT_SOURCE_DIR}/VM/src/llsl.cpp
)
set_source_files_properties(${FP_SENSITIVE_SOURCE_FILES} PROPERTIES COMPILE_FLAGS "-ffp-contract=off")

Expand Down
4 changes: 2 additions & 2 deletions Tailslide/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,9 @@ endif()
if (TAILSLIDE_BUILD_CLI)
add_executable(tailslide_cli tailslide_cli/main.cc)
target_sources(tailslide_cli PRIVATE
${CMAKE_SOURCE_DIR}/extern/cxxopt.hh
${CMAKE_CURRENT_SOURCE_DIR}/extern/cxxopt.hh
)
target_include_directories(tailslide_cli PRIVATE tailslide ${CMAKE_SOURCE_DIR}/extern)
target_include_directories(tailslide_cli PRIVATE tailslide ${CMAKE_CURRENT_SOURCE_DIR}/extern)
target_link_libraries(tailslide_cli PUBLIC ${EXTRA_LIBS} libtailslide)
set_target_properties(tailslide_cli PROPERTIES OUTPUT_NAME tailslide)
endif()
Expand Down
Loading