From 9662ae7126b30e362029d1c8ecb39e155b8b1e36 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Fri, 5 Jun 2026 15:39:58 +0000 Subject: [PATCH] Build FLAIM only with nwdirectory --- CMakeLists.txt | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5627565..3e0e55b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -256,19 +256,20 @@ add_subdirectory(third_party/matrixssl) add_subdirectory(src/core) add_subdirectory(src/ssl) -# Bundled FLAIM storage stack. Keep the imported sources unchanged; the CMake -# wrapper builds only the mars-nwe-needed libraries and routes legacy TLS/crypto -# compatibility through nwssl. -set(NWFLAIM_LIBRARY_PREFIX nw CACHE STRING "" FORCE) -set(NWFLAIM_BUILD_SHARED ON CACHE BOOL "" FORCE) -set(NWFLAIM_BUILD_STATIC OFF CACHE BOOL "" FORCE) -set(NWFLAIM_BUILD_SQL ON CACHE BOOL "" FORCE) -set(NWFLAIM_WITH_OPENSSL ON CACHE BOOL "" FORCE) -set(NWFLAIM_SSL_TARGET mars_nwe::ssl CACHE STRING "" FORCE) -set(NWFLAIM_NICI_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/include/nwssl/private/nici" CACHE PATH "" FORCE) -add_subdirectory(third_party/flaim) - if(ENABLE_DIRECTORY) + # Bundled FLAIM storage stack. Keep the imported sources unchanged; the CMake + # wrapper builds only the directory-needed libraries/tools and routes legacy + # TLS/crypto compatibility through nwssl. FLAIM is only needed with the + # optional nwdirectory/TinyLDAP subsystem, so do not build it otherwise. + set(NWFLAIM_LIBRARY_PREFIX nw CACHE STRING "" FORCE) + set(NWFLAIM_BUILD_SHARED ON CACHE BOOL "" FORCE) + set(NWFLAIM_BUILD_STATIC OFF CACHE BOOL "" FORCE) + set(NWFLAIM_BUILD_SQL ON CACHE BOOL "" FORCE) + set(NWFLAIM_WITH_OPENSSL ON CACHE BOOL "" FORCE) + set(NWFLAIM_SSL_TARGET mars_nwe::ssl CACHE STRING "" FORCE) + set(NWFLAIM_NICI_INCLUDE_DIR "${CMAKE_SOURCE_DIR}/include/nwssl/private/nici" CACHE PATH "" FORCE) + add_subdirectory(third_party/flaim) + set(TINYLDAP_OUTPUT_NAME nwdirectory CACHE STRING "" FORCE) set(TINYLDAP_BUILD_SHARED ON CACHE BOOL "" FORCE) set(TINYLDAP_BUILD_STATIC OFF CACHE BOOL "" FORCE) @@ -303,6 +304,7 @@ message(STATUS "Install DOS utilities: ${MARS_NWE_INSTALL_DOSUTILS}") message(STATUS "Install new DOS utilities: ${MARS_NWE_INSTALL_NEW_DOSUTILS}") message(STATUS "Build DOS utilities: ${MAINTAINER_BUILD} (maintainer build)") message(STATUS "Build nwdirectory: ${ENABLE_DIRECTORY}") +message(STATUS "Build FLAIM: ${ENABLE_DIRECTORY} (requires nwdirectory)") message(STATUS "Build MatrixSSL programs: ${MARS_NWE_BUILD_MATRIXSSL_PROGRAMS}") message(STATUS "Build nwcore: ON") message(STATUS "Build nwssl: ON")