sharpetronics/liboqs
1
0
Fork 0
mirror of https://github.com/open-quantum-safe/liboqs.git synced 2025-10-07 00:10:54 -04:00
Code Issues Projects Releases Wiki Activity

Triggering more downstream CircleCI jobs and removed GNUInstallDirs from CMake. (#850)

Browse Source
This commit is contained in:
Goutam Tamvada 2020-11-05 10:53:59 -05:00 committed by GitHub
parent 46693cf93a
commit 49559aecfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.circleci/config.yml
View File

@ -168,6 +168,30 @@ jobs:
--header "Content-Type: application/json" \
-d '{ "branch": "OQS-master", "parameters": { "run_downstream_tests": true } }' \
https://circleci.com/api/v2/project/gh/open-quantum-safe/openssh/pipeline
- run:
name: Trigger liboqs-dotnet CI
command: |
curl -u ${BUILD_TRIGGER_TOKEN}: \
-X POST \
--header "Content-Type: application/json" \
-d '{ "branch": "master" }' \
https://circleci.com/api/v2/project/gh/open-quantum-safe/liboqs-dotnet/pipeline
- run:
name: Trigger liboqs-java CI
command: |
curl -u ${BUILD_TRIGGER_TOKEN}: \
-X POST \
--header "Content-Type: application/json" \
-d '{ "branch": "master" }' \
https://circleci.com/api/v2/project/gh/open-quantum-safe/liboqs-java/pipeline
- run:
name: Trigger liboqs-python CI
command: |
curl -u ${BUILD_TRIGGER_TOKEN}: \
-X POST \
--header "Content-Type: application/json" \
-d '{ "branch": "master" }' \
https://circleci.com/api/v2/project/gh/open-quantum-safe/liboqs-python/pipeline
workflows:
version: 2.1
@ -225,16 +249,15 @@ workflows:
context: openquantumsafe
CONTAINER: openquantumsafe/ci-ubuntu-bionic-x86_64:latest
CMAKE_ARGS: -DCMAKE_C_COMPILER=clang-9 -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Address
# Disabling for now due to bunch of persistent failures.
# Disabling for now due to https://github.com/open-quantum-safe/liboqs/issues/791
#- linux_x64:
# <<: *exclude_master
# <<: *require_stylecheck
# name: undefined-sanitizer
# context: openquantumsafe
# CONTAINER: openquantumsafe/ci-ubuntu-bionic-x86_64:latest
# CMAKE_ARGS: -DCMAKE_C_COMPILER=clang-9 -DCMAKE_BUILD_TYPE=Debug -DUSE_SANITIZER=Undefined
# Normally the linux tests are run with 35 processes, but that
# exhausts memory for this test
# Normally the linux tests are run with 35 processes, but that
# exhausts memory for this test
# PYTEST_ARGS: --numprocesses=1
# SPHINCS exhausts memory on CircleCI servers

14
src/CMakeLists.txt
View File

@ -83,18 +83,16 @@ set_target_properties(oqs
# For Windows DLLs
RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
include(GNUInstallDirs)
install(TARGETS oqs EXPORT liboqsConfig
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
RUNTIME DESTINATION bin
INCLUDES DESTINATION include)
install(EXPORT liboqsConfig
NAMESPACE OQS::
DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/liboqs
DESTINATION lib/cmake/liboqs
)
install(FILES ${PUBLIC_HEADERS}
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/oqs)
DESTINATION include/oqs)