Skip to content

Commit

Permalink
Merge pull request #66 from Quicr/win2
Browse files Browse the repository at this point in the history
remove test from windows build
  • Loading branch information
fluffy committed Nov 22, 2023
2 parents b38409b + e3843ff commit aa32436
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
5 changes: 2 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,11 @@ jobs:
#vcpkg install openssl
fi
shell: bash



- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
# See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_SHARED_LIBS=OFF
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}

- name: Build
# Build your program with the given configuration
Expand Down
6 changes: 1 addition & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
cmake_minimum_required(VERSION 3.13)

set(CMAKE_CXX_STANDARD 17)
set(CMAKE_C_STANDARD 11)
set(CMAKE_C_STANDARD 11) # to move this to 17, need min CMake 3.21
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_C_STANDARD_REQUIRED ON)

Expand All @@ -21,10 +21,6 @@ else ()
set( OBJ_CRYPTO_USE_BORINGSSL True CACHE BOOL "use BoringSSL for crypto" )
endif ()

if ( WIN32 )
set( OBJ_CRYPTO_BUILD_TESTS False CACHE BOOL "build tests" )
endif()

# ObjCrypto compiler options
option( OBJ_CRYPTO_USE_BORINGSSL "Use BoringSSL for crypto" )
option( OBJ_CRYPTO_BUILD_TESTS "Build test programs" ON )
Expand Down
5 changes: 5 additions & 0 deletions test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ add_test( NAME testTest
COMMAND testTest )



if ( NOT WIN32 ) # TODO - Add back in

add_executable( testVersion
testVersion.cc
)
Expand Down Expand Up @@ -52,6 +55,8 @@ add_executable ( testAesGcm
target_link_libraries( testAesGcm PRIVATE objCrypto doctest::doctest )
add_test( NAME testAesGcm
COMMAND testAesGcm )

endif() # for WIN32 test above


add_executable ( speedNul
Expand Down

0 comments on commit aa32436

Please sign in to comment.