nixpkgs/pkgs/development/lua-modules/toml.patch

Ignoring revisions in .git-blame-ignore-revs. Click here to bypass and see the normal blame view.

53 lines
1.5 KiB
Diff
Raw Normal View History

2023-10-12 22:55:00 +00:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
2024-03-09 18:59:15 +00:00
index faae37a..6990d4a 100644
2023-10-12 22:55:00 +00:00
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,26 +38,17 @@ include(FetchContent)
FetchContent_Declare(
${TOML++}
- GIT_REPOSITORY "https://github.com/marzer/tomlplusplus.git"
- GIT_SHALLOW ON
- GIT_SUBMODULES ""
2024-03-09 18:59:15 +00:00
- GIT_TAG "v3.4.0"
+ DOWNLOAD_COMMAND true
2023-10-12 22:55:00 +00:00
)
FetchContent_Declare(
${SOL2}
- GIT_REPOSITORY "https://github.com/ThePhD/sol2.git"
- GIT_SHALLOW ON
- GIT_SUBMODULES ""
- GIT_TAG "v3.3.0"
2024-03-09 18:59:15 +00:00
+ DOWNLOAD_COMMAND true
2023-10-12 22:55:00 +00:00
)
FetchContent_Declare(
${MAGIC_ENUM}
- GIT_REPOSITORY "https://github.com/Neargye/magic_enum.git"
- GIT_SHALLOW ON
- GIT_SUBMODULES ""
2024-03-09 18:59:15 +00:00
- GIT_TAG "v0.9.5"
+ DOWNLOAD_COMMAND true
2023-10-12 22:55:00 +00:00
)
FetchContent_GetProperties(${TOML++})
2024-03-09 18:59:15 +00:00
@@ -112,7 +103,7 @@ if(NOT LUA_INCLUDE_DIR OR (WIN32 AND NOT LUA_LIBRARIES))
2023-10-12 22:55:00 +00:00
find_package(Lua)
endif()
-include_directories(${LUA_INCLUDE_DIR} src src/include ${${TOML++}_SOURCE_DIR} ${${SOL2}_SOURCE_DIR}/include ${${MAGIC_ENUM}_SOURCE_DIR}/include)
2024-03-09 18:59:15 +00:00
+include_directories(${LUA_INCLUDE_DIR} src src/include TOML_PLUS_PLUS_SRC ${${SOL2}_SOURCE_DIR}/include MAGIC_ENUM_SRC/include)
2023-10-12 22:55:00 +00:00
set(SOURCES
src/toml.cpp
2024-03-09 18:59:15 +00:00
@@ -129,7 +120,7 @@ source_group(src FILES ${SOURCES})
if(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" OR MSVC)
target_link_options(toml.lua PUBLIC ${PROJECT_SOURCE_DIR}\\libs\\lua51.lib)
else()
- target_link_libraries(toml.lua ${LUA_LIBRARIES} tomlplusplus::tomlplusplus)
+ target_link_libraries(toml.lua ${LUA_LIBRARIES} tomlplusplus)
endif()
if (LINK_FLAGS)