Skip to content

Commit

Permalink
Also AWSLC_BINARY_DIR not PROJECT_BINARY_DIR
Browse files Browse the repository at this point in the history
  • Loading branch information
justsmth committed Feb 19, 2025
1 parent 530fb13 commit 9f10262
Show file tree
Hide file tree
Showing 12 changed files with 43 additions and 43 deletions.
26 changes: 13 additions & 13 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
if (NOT DEFINED CMAKE_C_STANDARD)
try_compile(
RESULT
${PROJECT_BINARY_DIR}
${AWSLC_BINARY_DIR}
SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/compiler_features_tests/c11.c"
COMPILE_DEFINITIONS -c -std=c11)
if(RESULT)
Expand Down Expand Up @@ -210,7 +210,7 @@ if(BORINGSSL_PREFIX AND BORINGSSL_PREFIX_SYMBOLS AND GO_EXECUTABLE)
if(IS_ABSOLUTE ${BORINGSSL_PREFIX_SYMBOLS})
set(BORINGSSL_PREFIX_SYMBOLS_PATH ${BORINGSSL_PREFIX_SYMBOLS})
else()
set(BORINGSSL_PREFIX_SYMBOLS_PATH ${PROJECT_BINARY_DIR}/${BORINGSSL_PREFIX_SYMBOLS})
set(BORINGSSL_PREFIX_SYMBOLS_PATH ${AWSLC_BINARY_DIR}/${BORINGSSL_PREFIX_SYMBOLS})
endif()

add_custom_command(
Expand Down Expand Up @@ -244,7 +244,7 @@ elseif(BORINGSSL_PREFIX AND BORINGSSL_PREFIX_HEADERS)
if(IS_ABSOLUTE ${BORINGSSL_PREFIX_HEADERS})
set(BORINGSSL_PREFIX_HEADERS_PATH ${BORINGSSL_PREFIX_HEADERS})
else()
set(BORINGSSL_PREFIX_HEADERS_PATH ${PROJECT_BINARY_DIR}/${BORINGSSL_PREFIX_HEADERS})
set(BORINGSSL_PREFIX_HEADERS_PATH ${AWSLC_BINARY_DIR}/${BORINGSSL_PREFIX_HEADERS})
endif()

file(COPY ${BORINGSSL_PREFIX_HEADERS_PATH}/openssl/boringssl_prefix_symbols.h DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/symbol_prefix_include/openssl)
Expand Down Expand Up @@ -280,7 +280,7 @@ endif()
macro(check_compiler file_to_test flag_to_set)
try_compile(
RESULT
${PROJECT_BINARY_DIR}
${AWSLC_BINARY_DIR}
SOURCES "${CMAKE_CURRENT_LIST_DIR}/tests/compiler_features_tests/${file_to_test}"
COMPILE_DEFINITIONS "-Werror"
OUTPUT_VARIABLE ERROR_MESSAGE)
Expand Down Expand Up @@ -1080,11 +1080,11 @@ if(BUILD_TESTING)
if(GO_EXECUTABLE)
if(FIPS)
if(MSVC)
set(ACVP_TOOL ${PROJECT_BINARY_DIR}/acvptool.exe)
set(TEST_WRAPPER ${PROJECT_BINARY_DIR}/testmodulewrapper.exe)
set(ACVP_TOOL ${AWSLC_BINARY_DIR}/acvptool.exe)
set(TEST_WRAPPER ${AWSLC_BINARY_DIR}/testmodulewrapper.exe)
else()
set(ACVP_TOOL ${PROJECT_BINARY_DIR}/acvptool)
set(TEST_WRAPPER ${PROJECT_BINARY_DIR}/testmodulewrapper)
set(ACVP_TOOL ${AWSLC_BINARY_DIR}/acvptool)
set(TEST_WRAPPER ${AWSLC_BINARY_DIR}/testmodulewrapper)
endif()

# Read util/go_fips_tests.txt into a CMake variable.
Expand Down Expand Up @@ -1149,7 +1149,7 @@ if(BUILD_TESTING)
add_custom_target(
macho_parser_tests
COMMAND ./util/fipstools/inject_hash/macho_parser/tests/test_macho_parser
WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
WORKING_DIRECTORY ${AWSLC_BINARY_DIR}
DEPENDS test_macho_parser
)
add_dependencies(fips_specific_tests_if_any macho_parser_tests)
Expand Down Expand Up @@ -1194,7 +1194,7 @@ if(BUILD_TESTING)
COMMAND ${CMAKE_COMMAND} -E echo
COMMAND ${CMAKE_COMMAND} -E echo "Running unit tests"
COMMAND ${GO_EXECUTABLE} run util/all_tests.go -build-dir
${PROJECT_BINARY_DIR}
${AWSLC_BINARY_DIR}
WORKING_DIRECTORY ${AWSLC_SOURCE_DIR}
DEPENDS all_tests run_ssl_runner_tests
${MAYBE_USES_TERMINAL})
Expand All @@ -1206,7 +1206,7 @@ if(BUILD_TESTING)
COMMAND ${CMAKE_COMMAND} -E echo
COMMAND ${CMAKE_COMMAND} -E echo "Running unit tests"
COMMAND ${GO_EXECUTABLE} run util/all_tests.go -build-dir
${PROJECT_BINARY_DIR} -ssl-tests=false
${AWSLC_BINARY_DIR} -ssl-tests=false
WORKING_DIRECTORY ${AWSLC_SOURCE_DIR}
DEPENDS all_tests fips_specific_tests_if_any
${MAYBE_USES_TERMINAL}
Expand All @@ -1216,15 +1216,15 @@ if(BUILD_TESTING)
add_custom_target(
run_tests_valgrind
COMMAND ${GO_EXECUTABLE} run util/all_tests.go -build-dir
${PROJECT_BINARY_DIR} -valgrind=true -valgrind-supp-dir="tests/ci"
${AWSLC_BINARY_DIR} -valgrind=true -valgrind-supp-dir="tests/ci"
WORKING_DIRECTORY ${AWSLC_SOURCE_DIR}
DEPENDS all_tests
${MAYBE_USES_TERMINAL})

add_custom_target(
run_tests_with_sde
COMMAND ${GO_EXECUTABLE} run util/all_tests.go -build-dir
${PROJECT_BINARY_DIR} -sde=true -sde-path="$ENV{SDEROOT}/sde"
${AWSLC_BINARY_DIR} -sde=true -sde-path="$ENV{SDEROOT}/sde"
WORKING_DIRECTORY ${AWSLC_SOURCE_DIR}
DEPENDS all_tests
${MAYBE_USES_TERMINAL})
Expand Down
20 changes: 10 additions & 10 deletions crypto/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ function(msbuild_aarch64_asm)
COMMAND "${CMAKE_ASM_COMPILER}"
--target=arm64-pc-windows-msvc
/c
/I "${PROJECT_BINARY_DIR}/symbol_prefix_include/"
/I "${AWSLC_BINARY_DIR}/symbol_prefix_include/"
/I "${AWSLC_SOURCE_DIR}/include"
/o "${OBJ_FILE}"
"${ASM_FILE}"
Expand Down Expand Up @@ -582,7 +582,7 @@ add_library(
target_compile_definitions(crypto_objects PRIVATE BORINGSSL_IMPLEMENTATION)
# For the prefix build, the object files need the prefix header files to build.
add_dependencies(crypto_objects boringssl_prefix_symbols)
target_include_directories(crypto_objects BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(crypto_objects BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
target_include_directories(crypto_objects PRIVATE ${AWSLC_SOURCE_DIR}/include)

function(build_libcrypto name module_source)
Expand All @@ -605,7 +605,7 @@ function(build_libcrypto name module_source)
endif()

add_dependencies(${name} boringssl_prefix_symbols)
target_include_directories(${name} BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(${name} BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)

target_include_directories(${name} PUBLIC
$<BUILD_INTERFACE:${AWSLC_SOURCE_DIR}/include>
Expand All @@ -622,7 +622,7 @@ if(FIPS_SHARED)
add_executable(fips_empty_main fipsmodule/fips_empty_main.c)
target_link_libraries(fips_empty_main PUBLIC precrypto)
target_include_directories(fips_empty_main PRIVATE ${AWSLC_SOURCE_DIR}/include)
target_include_directories(fips_empty_main BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(fips_empty_main BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
add_custom_command(OUTPUT generated_fips_shared_support.c
COMMAND ${GO_EXECUTABLE} run
${AWSLC_SOURCE_DIR}/util/fipstools/capture_hash/capture_hash.go
Expand All @@ -640,7 +640,7 @@ if(FIPS_SHARED)
)
add_dependencies(generated_fipsmodule boringssl_prefix_symbols)
target_include_directories(generated_fipsmodule PRIVATE ${AWSLC_SOURCE_DIR}/include)
target_include_directories(generated_fipsmodule BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(generated_fipsmodule BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)

build_libcrypto(crypto $<TARGET_OBJECTS:generated_fipsmodule>)
else()
Expand Down Expand Up @@ -718,7 +718,7 @@ if(BUILD_TESTING)
target_compile_definitions(${executable_name} PRIVATE BORINGSSL_IMPLEMENTATION)
target_link_libraries(${executable_name} boringssl_gtest_main)
add_dependencies(${executable_name} boringssl_prefix_symbols)
target_include_directories(${executable_name} BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(${executable_name} BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
add_dependencies(all_tests ${executable_name})
set_test_location(${executable_name})
endmacro()
Expand All @@ -740,7 +740,7 @@ if(BUILD_TESTING)

add_dependencies(${RANDOM_TEST_EXEC} boringssl_prefix_symbols)
target_link_libraries(${RANDOM_TEST_EXEC} test_support_lib boringssl_gtest crypto)
target_include_directories(${RANDOM_TEST_EXEC} BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(${RANDOM_TEST_EXEC} BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)

add_dependencies(all_tests ${RANDOM_TEST_EXEC})

Expand Down Expand Up @@ -841,7 +841,7 @@ if(BUILD_TESTING)

add_dependencies(${CRYPTO_TEST_EXEC} boringssl_prefix_symbols)
target_link_libraries(${CRYPTO_TEST_EXEC} boringssl_gtest_main)
target_include_directories(${CRYPTO_TEST_EXEC} BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(${CRYPTO_TEST_EXEC} BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
if(MSVC)
target_link_libraries(${CRYPTO_TEST_EXEC} ws2_32)
else()
Expand All @@ -856,7 +856,7 @@ if(BUILD_TESTING)
set_test_location(${DYNAMIC_LOADING_TEST_EXEC})

add_dependencies(${DYNAMIC_LOADING_TEST_EXEC} boringssl_prefix_symbols)
target_include_directories(${DYNAMIC_LOADING_TEST_EXEC} BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(${DYNAMIC_LOADING_TEST_EXEC} BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)

set(DYNAMIC_LINKER_LIB "")
if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR APPLE OR ANDROID)
Expand All @@ -881,7 +881,7 @@ if(BUILD_TESTING)
set_test_location(${RWLOCK_STATIC_INIT_TEST_EXEC})

target_link_libraries(${RWLOCK_STATIC_INIT_TEST_EXEC} crypto)
target_include_directories(${RWLOCK_STATIC_INIT_TEST_EXEC} BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(${RWLOCK_STATIC_INIT_TEST_EXEC} BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
if(MSVC)
target_link_libraries(${RWLOCK_STATIC_INIT_TEST_EXEC} ws2_32)
else()
Expand Down
12 changes: 6 additions & 6 deletions crypto/fipsmodule/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ function(s2n_asm_cpreprocess dest src)
string(REGEX REPLACE "[ ]+" ";" CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS}")

if(BORINGSSL_PREFIX)
set(S2N_BIGNUM_PREFIX_INCLUDE "--include=${PROJECT_BINARY_DIR}/symbol_prefix_include/openssl/boringssl_prefix_symbols.h")
set(S2N_BIGNUM_PREFIX_INCLUDE "--include=${AWSLC_BINARY_DIR}/symbol_prefix_include/openssl/boringssl_prefix_symbols.h")
endif()

add_custom_command(
Expand Down Expand Up @@ -424,7 +424,7 @@ if(FIPS_DELOCATE)
target_compile_definitions(bcm_hashunset PRIVATE BORINGSSL_IMPLEMENTATION)

add_dependencies(bcm_hashunset boringssl_prefix_symbols)
target_include_directories(bcm_hashunset BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(bcm_hashunset BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
target_include_directories(bcm_hashunset PRIVATE ${AWSLC_SOURCE_DIR}/include)

set_target_properties(bcm_hashunset PROPERTIES POSITION_INDEPENDENT_CODE ON)
Expand Down Expand Up @@ -456,7 +456,7 @@ if(FIPS_DELOCATE)
target_compile_definitions(fipsmodule PRIVATE BORINGSSL_IMPLEMENTATION)

add_dependencies(fipsmodule boringssl_prefix_symbols)
target_include_directories(fipsmodule BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(fipsmodule BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
target_include_directories(fipsmodule PRIVATE ${AWSLC_SOURCE_DIR}/include)

set_target_properties(fipsmodule PROPERTIES LINKER_LANGUAGE C)
Expand All @@ -476,7 +476,7 @@ elseif(FIPS_SHARED)
target_compile_definitions(fipsmodule PRIVATE BORINGSSL_IMPLEMENTATION)

add_dependencies(fipsmodule boringssl_prefix_symbols)
target_include_directories(fipsmodule BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(fipsmodule BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
target_include_directories(fipsmodule PRIVATE ${AWSLC_SOURCE_DIR}/include)

add_library(
Expand All @@ -492,7 +492,7 @@ elseif(FIPS_SHARED)
target_include_directories(bcm_library PRIVATE ${AWSLC_SOURCE_DIR}/include)

add_dependencies(bcm_library boringssl_prefix_symbols)
target_include_directories(bcm_library BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(bcm_library BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
target_include_directories(bcm_library PRIVATE ${AWSLC_SOURCE_DIR}/include)
if (APPLE)
set(BCM_NAME bcm.o)
Expand Down Expand Up @@ -600,7 +600,7 @@ else()
target_compile_definitions(fipsmodule PRIVATE BORINGSSL_IMPLEMENTATION)

add_dependencies(fipsmodule boringssl_prefix_symbols)
target_include_directories(fipsmodule BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(fipsmodule BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
target_include_directories(fipsmodule PRIVATE ${AWSLC_SOURCE_DIR}/include)

endif()
4 changes: 2 additions & 2 deletions crypto/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ if(WIN32)
endif()
target_link_libraries(test_support_lib boringssl_gtest crypto)

target_include_directories(test_support_lib BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(test_support_lib BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)

add_library(boringssl_gtest_main STATIC gtest_main.cc)
target_link_libraries(boringssl_gtest_main boringssl_gtest crypto test_support_lib)
target_include_directories(boringssl_gtest_main BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(boringssl_gtest_main BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
2 changes: 1 addition & 1 deletion fuzz/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ macro(fuzzer name)
add_executable(${name} ${name}.cc)
target_compile_options(${name} PRIVATE "-Wno-missing-prototypes")
target_link_libraries(${name} crypto ${ARGN})
target_include_directories(${name} BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(${name} BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
if(LIBFUZZER_FROM_DEPS)
set_target_properties(${name} PROPERTIES LINK_FLAGS "-fsanitize=fuzzer-no-link")
target_link_libraries(${name} Fuzzer)
Expand Down
6 changes: 3 additions & 3 deletions ssl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ target_compile_definitions(ssl PRIVATE BORINGSSL_IMPLEMENTATION)

target_link_libraries(ssl crypto)

target_include_directories(ssl BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(ssl BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)

target_include_directories(ssl PUBLIC
$<BUILD_INTERFACE:${AWSLC_SOURCE_DIR}/include>
Expand All @@ -71,7 +71,7 @@ if(BUILD_TESTING)
)
target_link_libraries(${INTEGRATION_TEST_EXEC}
boringssl_gtest_main ssl )
target_include_directories(${INTEGRATION_TEST_EXEC} BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(${INTEGRATION_TEST_EXEC} BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
add_dependencies(all_tests ${INTEGRATION_TEST_EXEC})
set_test_location(${INTEGRATION_TEST_EXEC})

Expand All @@ -87,7 +87,7 @@ if(BUILD_TESTING)
target_link_libraries(${SSL_TEST_EXEC} boringssl_gtest_main ssl)
set_test_location(${SSL_TEST_EXEC})

target_include_directories(${SSL_TEST_EXEC} BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(${SSL_TEST_EXEC} BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)

if(WIN32)
target_link_libraries(${SSL_TEST_EXEC} ws2_32)
Expand Down
4 changes: 2 additions & 2 deletions ssl/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ if(WIN32)
target_link_libraries(bssl_shim ws2_32)
endif()

target_include_directories(bssl_shim BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(bssl_shim BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)

if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
add_executable(
Expand All @@ -35,7 +35,7 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")

target_link_libraries(handshaker test_support_lib ssl crypto)

target_include_directories(handshaker BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(handshaker BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
else()
# Declare a dummy target for run_tests to depend on.
add_custom_target(handshaker)
Expand Down
2 changes: 1 addition & 1 deletion third_party/jitterentropy/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@ endif()
set_source_files_properties(${JITTER_SOURCES} PROPERTIES COMPILE_FLAGS ${JITTER_COMPILE_FLAGS})
add_library(jitterentropy OBJECT ${JITTER_SOURCES})
add_dependencies(jitterentropy boringssl_prefix_symbols)
target_include_directories(jitterentropy BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(jitterentropy BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
4 changes: 2 additions & 2 deletions tool-openssl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ else()
endif()
endif()

target_include_directories(openssl BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(openssl BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)

install(TARGETS openssl
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
Expand Down Expand Up @@ -74,7 +74,7 @@ if(BUILD_TESTING)
)

target_link_libraries(tool_openssl_test boringssl_gtest_main ssl crypto)
target_include_directories(tool_openssl_test BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(tool_openssl_test BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
add_dependencies(all_tests tool_openssl_test)
set_test_location(tool_openssl_test)
endif()
2 changes: 1 addition & 1 deletion tool/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ else()
endif()
endif()

target_include_directories(bssl BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(bssl BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)

install(TARGETS bssl
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
Expand Down
2 changes: 1 addition & 1 deletion util/fipstools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if(FIPS AND BUILD_TESTING)
test_fips.c
)
target_link_libraries(test_fips crypto)
target_include_directories(test_fips BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(test_fips BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)

add_subdirectory(inject_hash/macho_parser/tests)
endif()
2 changes: 1 addition & 1 deletion util/fipstools/acvp/modulewrapper/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ if(FIPS)
modulewrapper.cc
)
target_link_libraries(modulewrapper crypto)
target_include_directories(modulewrapper BEFORE PRIVATE ${PROJECT_BINARY_DIR}/symbol_prefix_include)
target_include_directories(modulewrapper BEFORE PRIVATE ${AWSLC_BINARY_DIR}/symbol_prefix_include)
endif()

0 comments on commit 9f10262

Please sign in to comment.