Skip to content

Commit

Permalink
server: drop application framework (app_fw) feature
Browse files Browse the repository at this point in the history
This feature extended above the scope of this project and will be released as a separate project building on top of malloy.
  • Loading branch information
Tectu committed Jun 30, 2022
1 parent 94d059b commit fdae3c1
Show file tree
Hide file tree
Showing 42 changed files with 0 additions and 272,328 deletions.
15 changes: 0 additions & 15 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ project(
malloy
VERSION 0.4.0
LANGUAGES
C
CXX
HOMEPAGE_URL "https://github.com/tectu/malloy"
)
Expand All @@ -18,11 +17,8 @@ option(MALLOY_FEATURE_CLIENT "Whether to build the client" ON)
option(MALLOY_FEATURE_SERVER "Whether to build the server" ON)
option(MALLOY_FEATURE_HTML "Whether to enable HTML features" ON)
option(MALLOY_FEATURE_TLS "Whether to enable TLS features" OFF)
option(MALLOY_FEATURE_APPFW "Whether to enable the server-side application framework components" OFF)
option(MALLOY_DEPENDENCY_SPDLOG_DOWNLOAD "Whether to automatically fetch spdlog" ON)
option(MALLOY_DEPENDENCY_FMT_DOWNLOAD "Whether to automatically fetch fmt" ON)
option(MALLOY_DEPENDENCY_JSON_DOWNLOAD "Whether to automatically fetch nlohmann/json" ON)
option(MALLOY_DEPENDENCY_INJA_DOWNLOAD "Whether to automatically fetch pantor/inja" ON)

# Settings
set(MALLOY_WIN32_WINNT "0x0A00")
Expand Down Expand Up @@ -55,17 +51,9 @@ endif()

# Set dependencies accordingly
set(MALLOY_DEPENDENCY_OPENSSL OFF)
set(MALLOY_DEPENDENCY_JSON OFF)
set(MALLOY_DEPENDENCY_INJA OFF)
if (MALLOY_FEATURE_TLS)
set(MALLOY_DEPENDENCY_OPENSSL ON)
endif()
if (MALLOY_FEATURE_APPFW)
set(MALLOY_FEATURE_SERVER ON)
set(MALLOY_FEATURE_HTML ON)
set(MALLOY_DEPENDENCY_JSON ON)
set(MALLOY_DEPENDENCY_INJA ON)
endif()

# Dependency minimum versions
set(MALLOY_DEPENDENCY_BOOST_VERSION_MIN 1.74.0)
Expand Down Expand Up @@ -98,12 +86,9 @@ message(" Client : " ${MALLOY_FEATURE_CLIENT})
message(" Server : " ${MALLOY_FEATURE_SERVER})
message(" HTML : " ${MALLOY_FEATURE_HTML})
message(" TLS : " ${MALLOY_FEATURE_TLS})
message(" App Framework : " ${MALLOY_FEATURE_APPFW})
message("")
message(" Dependencies:")
message(" OpenSSL : " ${MALLOY_DEPENDENCY_OPENSSL})
message(" JSON : " ${MALLOY_DEPENDENCY_JSON})
message(" inja : " ${MALLOY_DEPENDENCY_INJA})
message("-------------------------------")
message("")

Expand Down
3 changes: 0 additions & 3 deletions examples/server/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,3 @@ endif()
if (MALLOY_FEATURE_TLS)
add_subdirectory(ssl)
endif()
if (MALLOY_FEATURE_APPFW)
add_subdirectory(applications)
endif()
1 change: 0 additions & 1 deletion examples/server/applications/CMakeLists.txt

This file was deleted.

13 changes: 0 additions & 13 deletions examples/server/applications/demo01/3rdparty/sqlite/CMakeLists.txt

This file was deleted.

Loading

0 comments on commit fdae3c1

Please sign in to comment.