diff --git a/.circleci/config.yml b/.circleci/config.yml index 89408c4c..578eef48 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -74,6 +74,7 @@ jobs: name: Run tests command: | if << parameters.OQS_PROVIDER_BUILD_STATIC >> ; then + test -f _build/lib/oqsprovider.a ctest --test-dir _build/ else ./scripts/runtests.sh -V @@ -98,6 +99,7 @@ jobs: name: Run tests (-DNOPUBKEY_IN_PRIVKEY=ON) command: | if << parameters.OQS_PROVIDER_BUILD_STATIC >> ; then + test -f _build/lib/oqsprovider.a ctest --test-dir _build/ else ./scripts/runtests.sh -V @@ -175,6 +177,7 @@ jobs: name: Run tests command: | if << parameters.OQS_PROVIDER_BUILD_STATIC >> ; then + test -f _build/lib/oqsprovider.a ctest --test-dir _build/ --output-on-failure else ./scripts/runtests.sh -V @@ -191,6 +194,7 @@ jobs: name: Run tests command: | if << parameters.OQS_PROVIDER_BUILD_STATIC >> ; then + test -f _build/lib/oqsprovider.a ctest --test-dir _build/ --output-on-failure else ./scripts/runtests.sh -V diff --git a/oqsprov/CMakeLists.txt b/oqsprov/CMakeLists.txt index 9bc7870f..93ba12f3 100644 --- a/oqsprov/CMakeLists.txt +++ b/oqsprov/CMakeLists.txt @@ -58,24 +58,26 @@ set_target_properties(oqsprovider # For Windows DLLs RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") -if (APPLE) - # OpenSSL looks for `.dylib` files on XNU-based platforms. - # Because `MODULE` writes to a `.so` file by default, we must explicitely - # set the suffix here. - set_target_properties(oqsprovider - PROPERTIES - SUFFIX ".dylib" - ) -endif() +if (NOT OQS_PROVIDER_BUILD_STATIC) + if (APPLE) + # OpenSSL looks for `.dylib` files on XNU-based platforms. + # Because `MODULE` writes to a `.so` file by default, we must explicitely + # set the suffix here. + set_target_properties(oqsprovider + PROPERTIES + SUFFIX ".dylib" + ) + endif() -if (CYGWIN OR MSVC) - # OpenSSL looks for `.dll` files on Windows platforms. - # Because `MODULE` writes to a `.so` file by default, we must explicitely - # set the suffix here. - set_target_properties(oqsprovider - PROPERTIES - SUFFIX ".dll" - ) + if (CYGWIN OR MSVC) + # OpenSSL looks for `.dll` files on Windows platforms. + # Because `MODULE` writes to a `.so` file by default, we must explicitely + # set the suffix here. + set_target_properties(oqsprovider + PROPERTIES + SUFFIX ".dll" + ) + endif() endif() target_link_libraries(oqsprovider PUBLIC OQS::oqs ${OPENSSL_CRYPTO_LIBRARY} ${OQS_ADDL_SOCKET_LIBS})