This commit is contained in:
reshke 2020-12-30 18:44:19 +05:00 committed by kirill reshke
parent 73f10f7b6c
commit 0933d1ebb3
4 changed files with 10 additions and 0 deletions

6
.gitignore vendored
View File

@ -2,6 +2,9 @@
*.a
*.so
.idea/
.init
.conf.example
.logrotate
sources/odyssey
sources/build.h
stress/odyssey_stress
@ -15,3 +18,6 @@ build/
build-asan/
cmake-build-debug/
test/shell-test/odyssey
debian/changelog
debian/control
debian/rules

View File

@ -157,6 +157,7 @@ message(STATUS "BORINGSSL_INCLUDE_DIR: ${BORINGSSL_INCLUDE_DIR}")
message(STATUS "OPENSSL_VERSION: ${OPENSSL_VERSION}")
message(STATUS "OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
message(STATUS "OPENSSL_INCLUDE_DIR: ${OPENSSL_INCLUDE_DIR}")
message(STATUS "OPENSSL_LIBRARIES: ${OPENSSL_LIBRARIES}")
message(STATUS "PAM_LIBRARY: ${PAM_LIBRARY}")
message(STATUS "PAM_INCLUDE_DIR: ${PAM_INCLUDE_DIR}")
message(STATUS "BUILD_COMPRESSION: ${BUILD_COMPRESSION}")

View File

@ -11,6 +11,7 @@ macro(build_machinarium)
-DBORINGSSL_INCLUDE_DIR=${BORINGSSL_INCLUDE_DIR}
-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
-DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR}
-DOPENSSL_LIBRARIES=${OPENSSL_LIBRARIES}
-DBUILD_COMPRESSION=${BUILD_COMPRESSION}
COMMAND ${CMAKE_MAKE_PROGRAM} -C ${PROJECT_BINARY_DIR}/third_party/machinarium
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/third_party/machinarium
@ -27,6 +28,7 @@ macro(build_machinarium)
-DBORINGSSL_INCLUDE_DIR=${BORINGSSL_INCLUDE_DIR}
-DOPENSSL_ROOT_DIR=${OPENSSL_ROOT_DIR}
-DOPENSSL_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR}
-DOPENSSL_LIBRARIES=${OPENSSL_LIBRARIES}
-DBUILD_COMPRESSION=${BUILD_COMPRESSION} .
COMMAND ${CMAKE_MAKE_PROGRAM} -C ${PROJECT_BINARY_DIR}/third_party/machinarium
)

View File

@ -87,6 +87,7 @@ message(STATUS "BORINGSSL_INCLUDE_DIR: ${BORINGSSL_INCLUDE_DIR}")
message(STATUS "OPENSSL_VERSION: ${OPENSSL_VERSION}")
message(STATUS "OPENSSL_ROOT_DIR: ${OPENSSL_ROOT_DIR}")
message(STATUS "OPENSSL_INCLUDE_DIR: ${OPENSSL_INCLUDE_DIR}")
message(STATUS "OPENSSL_LIBRARIES: ${OPENSSL_LIBRARIES}")
message(STATUS "BUILD_COMPRESSION: ${BUILD_COMPRESSION}")
if (BUILD_COMPRESSION)
message(STATUS "ZSTD_INCLUDE_DIR: ${ZSTD_INCLUDE_DIR}")