From fa149b8c8c57a88db14bc017ff048b70963e9d86 Mon Sep 17 00:00:00 2001 From: Brent Cook Date: Sun, 22 Jan 2017 19:55:54 -0600 Subject: [PATCH] updates for new tests and layout --- crypto/CMakeLists.txt | 1 + crypto/Makefile.am | 1 + tests/CMakeLists.txt | 2 ++ tests/Makefile.am | 2 ++ 4 files changed, 6 insertions(+) diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt index 60df0d8..d8e1ddb 100644 --- a/crypto/CMakeLists.txt +++ b/crypto/CMakeLists.txt @@ -3,6 +3,7 @@ include_directories( ../include ../include/compat asn1 + bn dsa evp modes diff --git a/crypto/Makefile.am b/crypto/Makefile.am index 2f1e057..1332c24 100644 --- a/crypto/Makefile.am +++ b/crypto/Makefile.am @@ -1,6 +1,7 @@ include $(top_srcdir)/Makefile.am.common AM_CPPFLAGS += -I$(top_srcdir)/crypto/asn1 +AM_CPPFLAGS += -I$(top_srcdir)/crypto/bn AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes AM_CPPFLAGS += -I$(top_srcdir)/crypto diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9196783..fa1bb51 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -71,6 +71,7 @@ endif() # bntest add_executable(bntest bntest.c) +set_source_files_properties(bntest.c PROPERTIES COMPILE_FLAGS -ULIBRESSL_INTERNAL) target_link_libraries(bntest ${TESTS_LIBS}) add_test(bntest bntest) @@ -163,6 +164,7 @@ endif() # exptest add_executable(exptest exptest.c) +set_source_files_properties(exptest.c PROPERTIES COMPILE_FLAGS -ULIBRESSL_INTERNAL) target_link_libraries(exptest ${TESTS_LIBS}) add_test(exptest exptest) diff --git a/tests/Makefile.am b/tests/Makefile.am index c5dd713..2d13fed 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -73,6 +73,7 @@ endif # bntest TESTS += bntest +bntest_CPPFLAGS = $(AM_CPPFLAGS) -ULIBRESSL_INTERNAL check_PROGRAMS += bntest bntest_SOURCES = bntest.c @@ -170,6 +171,7 @@ endif # exptest TESTS += exptest check_PROGRAMS += exptest +exptest_CPPFLAGS = $(AM_CPPFLAGS) -ULIBRESSL_INTERNAL exptest_SOURCES = exptest.c # gcm128test