at 24.11-pre 1.7 kB view raw
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index ab3884c..c0fd356 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -38,32 +38,23 @@ include(FetchContent) 6 7 FetchContent_Declare( 8 ${TOML++} 9- GIT_REPOSITORY "https://github.com/marzer/tomlplusplus.git" 10- GIT_SHALLOW ON 11- GIT_SUBMODULES "" 12- GIT_TAG "v3.3.0" 13+ DOWNLOAD_COMMAND true 14 ) 15 16 FetchContent_Declare( 17 ${SOL2} 18- GIT_REPOSITORY "https://github.com/ThePhD/sol2.git" 19- GIT_SHALLOW ON 20- GIT_SUBMODULES "" 21- GIT_TAG "v3.3.0" 22+ DOWNLOAD_COMMAND true 23 ) 24 25 FetchContent_Declare( 26 ${MAGIC_ENUM} 27- GIT_REPOSITORY "https://github.com/Neargye/magic_enum.git" 28- GIT_SHALLOW ON 29- GIT_SUBMODULES "" 30- GIT_TAG "v0.8.2" 31+ DOWNLOAD_COMMAND true 32 ) 33 34 FetchContent_GetProperties(${TOML++}) 35 if(NOT ${TOML++}_POPULATED) 36 message(STATUS "Cloning ${TOML++}") 37- FetchContent_Populate(${TOML++}) 38+ FetchContent_Populate(${TOML++}) 39 FetchContent_MakeAvailable(${TOML++}) 40 endif() 41 42@@ -113,7 +104,7 @@ if(NOT LUA_INCLUDE_DIR OR (WIN32 AND NOT LUA_LIBRARIES)) 43 find_package(Lua) 44 endif() 45 46-include_directories(${LUA_INCLUDE_DIR} src src/include ${${TOML++}_SOURCE_DIR} ${${SOL2}_SOURCE_DIR}/include ${${MAGIC_ENUM}_SOURCE_DIR}/include) 47+include_directories(${LUA_INCLUDE_DIR} src src/include TOML_PLUS_PLUS_SRC ${${SOL2}_SOURCE_DIR}/include MAGIC_ENUM_SRC) 48 49 set(SOURCES 50 src/toml.cpp 51@@ -129,8 +120,8 @@ source_group(src FILES ${SOURCES}) 52 53 if(WIN32 AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") 54 target_link_options(toml.lua PUBLIC ${PROJECT_SOURCE_DIR}\\libs\\lua51.lib) 55-else() 56- target_link_libraries(toml.lua ${LUA_LIBRARIES}) 57+else() 58+ target_link_libraries(toml.lua ${LUA_LIBRARIES}) 59 endif() 60 61 if (LINK_FLAGS)