Skip to content

improvement: removes vcpkg #2108

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

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 12 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
[submodule "engine/vcpkg"]
path = engine/vcpkg
url = https://github.com/microsoft/vcpkg.git
[submodule "3rd-party/yaml-cpp"]
path = 3rd-party/yaml-cpp
url = https://github.com/jbeder/yaml-cpp.git
[submodule "3rd-party/cli11"]
path = 3rd-party/cli11
url = https://github.com/CLIUtils/CLI11.git
[submodule "3rd-party/drogon"]
path = 3rd-party/drogon
url = https://github.com/drogonframework/drogon.git
[submodule "3rd-party/tabulate"]
path = 3rd-party/tabulate
url = https://github.com/p-ranav/tabulate.git
1 change: 1 addition & 0 deletions 3rd-party/cli11
Submodule cli11 added at f871b6
1 change: 1 addition & 0 deletions 3rd-party/drogon
Submodule drogon added at cbf63f
1 change: 1 addition & 0 deletions 3rd-party/tabulate
Submodule tabulate added at 3a5830
1 change: 1 addition & 0 deletions 3rd-party/yaml-cpp
Submodule yaml-cpp added at 39f737
31 changes: 15 additions & 16 deletions engine/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ if(CMAKE_BUILD_INJA_TEST)
endif()

find_package(jsoncpp CONFIG REQUIRED)
find_package(Drogon CONFIG REQUIRED)
find_package(yaml-cpp CONFIG REQUIRED)
find_package(unofficial-minizip CONFIG REQUIRED)
find_package(LibArchive REQUIRED)
find_package(CURL REQUIRED)
Expand Down Expand Up @@ -167,26 +165,29 @@ file(APPEND "${CMAKE_CURRENT_BINARY_DIR}/cortex_openapi.h"
)
## End of generating openapi json

add_executable(${TARGET_NAME} main.cc
${CMAKE_CURRENT_SOURCE_DIR}/utils/cpuid/cpu_info.cc
${CMAKE_CURRENT_SOURCE_DIR}/utils/file_logger.cc

${CMAKE_CURRENT_SOURCE_DIR}/extensions/template_renderer.cc
${CMAKE_CURRENT_SOURCE_DIR}/extensions/python-engine/python_engine.cc
# Add Github 3rd-party submodules
add_subdirectory(../3rd-party/yaml-cpp ${CMAKE_BINARY_DIR}/yaml-cpp)
add_subdirectory(../3rd-party/cli11 ${CMAKE_BINARY_DIR}/cli11)
add_subdirectory(../3rd-party/drogon ${CMAKE_BINARY_DIR}/drogon)
add_subdirectory(../3rd-party/tabulate ${CMAKE_BINARY_DIR}/tabulate)

${CMAKE_CURRENT_SOURCE_DIR}/utils/dylib_path_manager.cc
${CMAKE_CURRENT_SOURCE_DIR}/utils/process/utils.cc

${CMAKE_CURRENT_SOURCE_DIR}/extensions/remote-engine/remote_engine.cc
# Collect all .cc files in various subdirectories recursively
file(GLOB_RECURSE UTILS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/utils/*.cc)
file(GLOB_RECURSE EXTENSIONS_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/extensions/*.cc)

add_executable(${TARGET_NAME} main.cc
${UTILS_SOURCES}
${EXTENSIONS_SOURCES}
)

target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})

target_link_libraries(${TARGET_NAME} PRIVATE drogon)
target_link_libraries(${TARGET_NAME} PRIVATE unofficial::minizip::minizip)
target_link_libraries(${TARGET_NAME} PRIVATE LibArchive::LibArchive)
target_link_libraries(${TARGET_NAME} PRIVATE CURL::libcurl)
target_link_libraries(${TARGET_NAME} PRIVATE JsonCpp::JsonCpp Drogon::Drogon OpenSSL::SSL OpenSSL::Crypto yaml-cpp::yaml-cpp
target_link_libraries(${TARGET_NAME} PRIVATE JsonCpp::JsonCpp OpenSSL::SSL OpenSSL::Crypto yaml-cpp
${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(${TARGET_NAME} PRIVATE SQLiteCpp)
target_link_libraries(${TARGET_NAME} PRIVATE eventpp::eventpp)
Expand All @@ -212,16 +213,14 @@ aux_source_directory(models MODEL_SRC)
aux_source_directory(cortex-common CORTEX_COMMON)
aux_source_directory(config CONFIG_SRC)
aux_source_directory(database DB_SRC)
aux_source_directory(extensions EX_SRC)
aux_source_directory(migrations MIGR_SRC)
aux_source_directory(utils UTILS_SRC)

target_include_directories(${TARGET_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} )

target_sources(${TARGET_NAME} PRIVATE ${UTILS_SRC} ${CONFIG_SRC} ${CTL_SRC} ${COMMON_SRC} ${SERVICES_SRC} ${DB_SRC} ${EX_SRC} ${MIGR_SRC} ${REPO_SRC})
target_sources(${TARGET_NAME} PRIVATE ${CONFIG_SRC} ${CTL_SRC} ${COMMON_SRC} ${SERVICES_SRC} ${DB_SRC} ${MIGR_SRC} ${REPO_SRC})

set_target_properties(${TARGET_NAME} PROPERTIES
RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR}
RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}
)
)
10 changes: 4 additions & 6 deletions engine/cli/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,8 @@ add_compile_definitions(CORTEX_CPP_VERSION="${CORTEX_CPP_VERSION}")
add_compile_definitions(CORTEX_CONFIG_FILE_PATH="${CORTEX_CONFIG_FILE_PATH}")

find_package(jsoncpp CONFIG REQUIRED)
find_package(yaml-cpp CONFIG REQUIRED)
find_package(CLI11 CONFIG REQUIRED)
find_package(unofficial-minizip CONFIG REQUIRED)
find_package(LibArchive REQUIRED)
find_package(tabulate CONFIG REQUIRED)
find_package(CURL REQUIRED)
find_package(SQLiteCpp REQUIRED)
find_package(Trantor CONFIG REQUIRED)
Expand Down Expand Up @@ -99,12 +96,13 @@ add_executable(${TARGET_NAME} main.cc
${CMAKE_CURRENT_SOURCE_DIR}/../utils/process/utils.cc
)

target_link_libraries(${TARGET_NAME} PRIVATE CLI11::CLI11)
target_link_libraries(${TARGET_NAME} PRIVATE CLI11)
target_link_libraries(${TARGET_NAME} PRIVATE drogon)
target_link_libraries(${TARGET_NAME} PRIVATE unofficial::minizip::minizip)
target_link_libraries(${TARGET_NAME} PRIVATE LibArchive::LibArchive)
target_link_libraries(${TARGET_NAME} PRIVATE tabulate::tabulate)
target_link_libraries(${TARGET_NAME} PRIVATE tabulate)
target_link_libraries(${TARGET_NAME} PRIVATE CURL::libcurl)
target_link_libraries(${TARGET_NAME} PRIVATE JsonCpp::JsonCpp OpenSSL::SSL OpenSSL::Crypto yaml-cpp::yaml-cpp
target_link_libraries(${TARGET_NAME} PRIVATE JsonCpp::JsonCpp OpenSSL::SSL OpenSSL::Crypto yaml-cpp
${CMAKE_THREAD_LIBS_INIT})
target_link_libraries(${TARGET_NAME} PRIVATE SQLiteCpp)
target_link_libraries(${TARGET_NAME} PRIVATE Trantor::Trantor)
Expand Down
5 changes: 0 additions & 5 deletions engine/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@
"dependencies": [
"curl",
"gtest",
"cli11",
"drogon",
"jsoncpp",
"minizip",
"yaml-cpp",
"libarchive",
"tabulate",
"eventpp",
"sqlitecpp",
"trantor",
Expand Down
Loading