Skip to content

Commit

Permalink
Fixed build of CMake <= 3.25
Browse files Browse the repository at this point in the history
Signed-off-by: Eran Ifrah <[email protected]>
  • Loading branch information
eranif committed Oct 11, 2024
1 parent 90d9adc commit 7cb897c
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
18 changes: 9 additions & 9 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -885,12 +885,12 @@ include_directories(submodules/dtl)
add_subdirectory(submodules)
include_directories(submodules/cJSON)

add_subdirectory(sdk/wxsqlite3 SYSTEM) # EXCLUDE_FROM_ALL)
add_subdirectory(sdk/wxshapeframework SYSTEM EXCLUDE_FROM_ALL)
add_subdirectory(sdk/databaselayer SYSTEM EXCLUDE_FROM_ALL)
add_subdirectory(sdk/wxsqlite3)
add_subdirectory(sdk/wxshapeframework)
add_subdirectory(sdk/databaselayer)

if(NOT APPLE)
add_subdirectory(submodules/yaml-cpp SYSTEM EXCLUDE_FROM_ALL)
add_subdirectory(submodules/yaml-cpp)
set(LIBYAML_CPP "yaml-cpp")
endif()

Expand All @@ -900,7 +900,7 @@ add_subdirectory(Plugin)
add_subdirectory(PCH)

set(WITHOUT_INSTALL ON)
add_subdirectory(submodules/cc-wrapper SYSTEM EXCLUDE_FROM_ALL)
add_subdirectory(submodules/cc-wrapper)

# include the yaml-cpp directory
include_directories("${CL_SRC_ROOT}/submodules/yaml-cpp/include")
Expand All @@ -914,19 +914,19 @@ if(APPLE)
set(CMAKE_INSTALL_BINDIR "${CMAKE_INSTALL_PREFIX}")
endif()

add_subdirectory("${CL_SRC_ROOT}/submodules/llama.cpp" SYSTEM EXCLUDE_FROM_ALL)
add_subdirectory("${CL_SRC_ROOT}/submodules/llama.cpp/examples/main" SYSTEM EXCLUDE_FROM_ALL)
add_subdirectory("${CL_SRC_ROOT}/submodules/llama.cpp")
add_subdirectory("${CL_SRC_ROOT}/submodules/llama.cpp/examples/main")

if(WXC_APP)
add_subdirectory(wxcrafter)
else()
add_subdirectory(submodules/ctags SYSTEM EXCLUDE_FROM_ALL)
add_subdirectory(submodules/ctags)
install(TARGETS ctags DESTINATION ${CL_INSTALL_BIN})
install(TARGETS llama-cli DESTINATION ${CL_INSTALL_BIN})

if(MINGW)
# build wx-config for Windows
add_subdirectory(submodules/wx-config-msys2 SYSTEM EXCLUDE_FROM_ALL)
add_subdirectory(submodules/wx-config-msys2)
install(TARGETS wx-config DESTINATION ${CL_INSTALL_BIN})
endif()

Expand Down
2 changes: 1 addition & 1 deletion DebugAdapterClient/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ add_definitions(-std=c++17)
set(PLUGIN_NAME "DebugAdapterClient")
project(DebugAdapterClient)

add_subdirectory("${CL_SRC_ROOT}/submodules/wxdap/dap" ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} SYSTEM EXCLUDE_FROM_ALL)
add_subdirectory("${CL_SRC_ROOT}/submodules/wxdap/dap" ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})

# wxWidgets include (this will do all the magic to configure everything)
include("${wxWidgets_USE_FILE}")
Expand Down

0 comments on commit 7cb897c

Please sign in to comment.