Skip to content

Commit 582a9ae

Browse files
committed
Fix dependencies - ensure fuzzers build after deps
1 parent 3b2800e commit 582a9ae

File tree

1 file changed

+22
-21
lines changed

1 file changed

+22
-21
lines changed

CMakeLists.txt

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -259,12 +259,13 @@ if (DEFINED ENV{LIB_FUZZING_ENGINE})
259259
message(STATUS "Using LIB_FUZZING_ENGINE as a compiler flag: $ENV{LIB_FUZZING_ENGINE}")
260260
set(LIB_FUZZING_ENGINE_FLAG $ENV{LIB_FUZZING_ENGINE})
261261
endif()
262-
262+
set(LIB_FUZZING_ENGINE_DEP "")
263263
else()
264+
message(STATUS "Compiling standaloneengine as LIB_FUZZING_ENGINE")
264265
add_library(standaloneengine STATIC standalone_fuzz_target_runner.cc)
265-
set_target_properties(standaloneengine PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
266266
set(LIB_FUZZING_ENGINE ${CMAKE_BINARY_DIR}/libstandaloneengine.a)
267267
set(LIB_FUZZING_ENGINE_FLAG "")
268+
set(LIB_FUZZING_ENGINE_DEP standaloneengine)
268269
endif()
269270

270271
# Common sources and flags
@@ -334,25 +335,25 @@ target_include_directories(curl_fuzzer_fnmatch PRIVATE ${CURL_INCLUDE_DIRS})
334335
target_link_libraries(curl_fuzzer_fnmatch PRIVATE ${COMMON_LINK_LIBS})
335336
target_link_options(curl_fuzzer_fnmatch PRIVATE ${COMMON_LINK_OPTIONS})
336337

337-
# Add dependencies so fuzzers build after curl
338-
add_dependencies(curl_fuzzer curl_external)
339-
add_dependencies(curl_fuzzer_dict curl_external)
340-
add_dependencies(curl_fuzzer_file curl_external)
341-
add_dependencies(curl_fuzzer_ftp curl_external)
342-
add_dependencies(curl_fuzzer_gopher curl_external)
343-
add_dependencies(curl_fuzzer_http curl_external)
344-
add_dependencies(curl_fuzzer_https curl_external)
345-
add_dependencies(curl_fuzzer_imap curl_external)
346-
add_dependencies(curl_fuzzer_mqtt curl_external)
347-
add_dependencies(curl_fuzzer_pop3 curl_external)
348-
add_dependencies(curl_fuzzer_rtsp curl_external)
349-
add_dependencies(curl_fuzzer_smb curl_external)
350-
add_dependencies(curl_fuzzer_smtp curl_external)
351-
add_dependencies(curl_fuzzer_tftp curl_external)
352-
add_dependencies(curl_fuzzer_ws curl_external)
353-
add_dependencies(curl_fuzzer_bufq curl_external)
354-
add_dependencies(fuzz_url curl_external)
355-
add_dependencies(curl_fuzzer_fnmatch curl_external)
338+
set(FUZZ_DEPS curl_external ${LIB_FUZZING_ENGINE_DEP} zlib_external nghttp2_external ${OPENSSL_DEP})
339+
add_dependencies(curl_fuzzer ${FUZZ_DEPS})
340+
add_dependencies(curl_fuzzer_dict ${FUZZ_DEPS})
341+
add_dependencies(curl_fuzzer_file ${FUZZ_DEPS})
342+
add_dependencies(curl_fuzzer_ftp ${FUZZ_DEPS})
343+
add_dependencies(curl_fuzzer_gopher ${FUZZ_DEPS})
344+
add_dependencies(curl_fuzzer_http ${FUZZ_DEPS})
345+
add_dependencies(curl_fuzzer_https ${FUZZ_DEPS})
346+
add_dependencies(curl_fuzzer_imap ${FUZZ_DEPS})
347+
add_dependencies(curl_fuzzer_mqtt ${FUZZ_DEPS})
348+
add_dependencies(curl_fuzzer_pop3 ${FUZZ_DEPS})
349+
add_dependencies(curl_fuzzer_rtsp ${FUZZ_DEPS})
350+
add_dependencies(curl_fuzzer_smb ${FUZZ_DEPS})
351+
add_dependencies(curl_fuzzer_smtp ${FUZZ_DEPS})
352+
add_dependencies(curl_fuzzer_tftp ${FUZZ_DEPS})
353+
add_dependencies(curl_fuzzer_ws ${FUZZ_DEPS})
354+
add_dependencies(curl_fuzzer_bufq ${FUZZ_DEPS})
355+
add_dependencies(fuzz_url ${FUZZ_DEPS})
356+
add_dependencies(curl_fuzzer_fnmatch ${FUZZ_DEPS})
356357

357358
# Create a custom target for all fuzzers
358359
add_custom_target(fuzz

0 commit comments

Comments
 (0)