Skip to content
Snippets Groups Projects
Commit bbfa847b authored by Dmitry Ivanov's avatar Dmitry Ivanov
Browse files

fix: Add extra byproducts to bundled ldap & sasl

This is needed to fix Ninja, which requires them to
build a dependency graph.

NO_DOC=picodata internal patch
NO_CHANGELOG=picodata internal patch
NO_TEST=picodata internal patch
parent 43ab3225
No related branches found
No related tags found
1 merge request!80fix: Add extra byproducts to bundled ldap & sasl
Pipeline #21161 failed
......@@ -68,6 +68,7 @@ coverage:
TEST_TIMEOUT: 400
NO_OUTPUT_TIMEOUT: 400
script:
- export PATH="$PATH:$PWD" # for GLAuth (CMake will download it)
- make -f .test.mk test-coverage
.pack:
......
......@@ -45,6 +45,7 @@ macro(ldap_build)
ExternalProject_Get_Property(bundled-ldap install_dir)
set(LDAP_INSTALL_DIR ${install_dir})
unset(install_dir)
# Unfortunately, we can't use find_library here,
# since the package hasn't been built yet.
......@@ -56,6 +57,9 @@ macro(ldap_build)
${LDAP_INSTALL_DIR}/lib/liblber.a
)
ExternalProject_Add_Step(bundled-ldap byproducts
BYPRODUCTS ${LDAP_LIBRARIES})
# On OS X we may also need to link libresolv.dylib.
# However, note that newer OS X releases don't have that file;
# instead, it's provided via a built-in dynamic linker cache.
......@@ -69,4 +73,7 @@ macro(ldap_build)
set(LDAP_LIBRARIES ${LDAP_LIBRARIES} ${RESOLV_LIBRARIES})
endif()
endif()
message(STATUS "Found LDAP includes: ${LDAP_INCLUDE_DIR}")
message(STATUS "Found LDAP libraries: ${LDAP_LIBRARIES}")
endmacro()
......@@ -50,6 +50,7 @@ macro(sasl_build)
ExternalProject_Get_Property(bundled-sasl install_dir)
set(SASL_INSTALL_DIR ${install_dir})
unset(install_dir)
# Unfortunately, we can't use find_library here,
# since the package hasn't been built yet.
......@@ -65,4 +66,10 @@ macro(sasl_build)
${SASL_INSTALL_DIR}/lib/sasl2/libplain.a
${SASL_INSTALL_DIR}/lib/sasl2/libscram.a
)
ExternalProject_Add_Step(bundled-sasl byproducts
BYPRODUCTS ${SASL_LIBRARIES})
message(STATUS "Found SASL includes: ${SASL_INCLUDE_DIR}")
message(STATUS "Found SASL libraries: ${SASL_LIBRARIES}")
endmacro()
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment