155 lines
4.2 KiB
Diff
155 lines
4.2 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index f9f71df..321caf5 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -28,7 +28,7 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
|
|
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
|
|
set (COMPILER_CLANG 1)
|
|
else ()
|
|
- message (FATAL_ERROR "Compiler ${CMAKE_CXX_COMPILER_ID} is not supported")
|
|
+ message (WARNING "Compiler ${CMAKE_CXX_COMPILER_ID} is not supported")
|
|
endif ()
|
|
|
|
if (COMPILER_GCC AND (FUZZTEST_FUZZING_MODE OR (FUZZTEST_COMPATIBILITY_MODE STREQUAL "libfuzzer")))
|
|
diff --git a/cmake/BuildDependencies.cmake b/cmake/BuildDependencies.cmake
|
|
index d8565c0..24b7f52 100644
|
|
--- a/cmake/BuildDependencies.cmake
|
|
+++ b/cmake/BuildDependencies.cmake
|
|
@@ -17,20 +17,20 @@ cmake_minimum_required(VERSION 3.19)
|
|
include(FetchContent)
|
|
|
|
set(absl_URL https://github.com/abseil/abseil-cpp.git)
|
|
-set(absl_TAG d04b964d82ed5146f7e5e34701a5ba69f9514c9a)
|
|
+set(absl_TAG 20250814.1)
|
|
|
|
set(re2_URL https://github.com/google/re2.git)
|
|
set(re2_TAG 2024-07-02)
|
|
|
|
set(gtest_URL https://github.com/google/googletest.git)
|
|
-set(gtest_TAG v1.16.0)
|
|
+set(gtest_TAG v1.17.0)
|
|
|
|
# From https://www.antlr.org/download.html
|
|
set(antlr_cpp_URL https://www.antlr.org/download/antlr4-cpp-runtime-4.12.0-source.zip)
|
|
set(antlr_cpp_MD5 acf7371bd7562188712751266d8a7b90)
|
|
|
|
set(proto_URL https://github.com/protocolbuffers/protobuf.git)
|
|
-set(proto_TAG v30.2)
|
|
+set(proto_TAG v33.1)
|
|
|
|
set(nlohmann_json_URL https://github.com/nlohmann/json.git)
|
|
set(nlohmann_json_TAG v3.11.3)
|
|
@@ -44,7 +44,7 @@ if(POLICY CMP0135)
|
|
endif()
|
|
|
|
FetchContent_Declare(
|
|
- abseil-cpp
|
|
+ absl
|
|
GIT_REPOSITORY ${absl_URL}
|
|
GIT_TAG ${absl_TAG}
|
|
)
|
|
@@ -93,7 +93,7 @@ endif ()
|
|
|
|
set(ABSL_PROPAGATE_CXX_STD ON)
|
|
set(ABSL_ENABLE_INSTALL ON)
|
|
-FetchContent_MakeAvailable(abseil-cpp)
|
|
+FetchContent_MakeAvailable(absl)
|
|
|
|
set(RE2_BUILD_TESTING OFF)
|
|
FetchContent_MakeAvailable(re2)
|
|
@@ -101,6 +101,7 @@ FetchContent_MakeAvailable(re2)
|
|
set(GTEST_HAS_ABSL ON)
|
|
FetchContent_MakeAvailable(googletest)
|
|
|
|
+set(ANTLR_BUILD_CPP_TESTS OFF)
|
|
FetchContent_MakeAvailable(antlr_cpp)
|
|
|
|
if (FUZZTEST_BUILD_TESTING)
|
|
diff --git a/cmake/FuzzTestHelpers.cmake b/cmake/FuzzTestHelpers.cmake
|
|
index 2869a77..8462fdd 100644
|
|
--- a/cmake/FuzzTestHelpers.cmake
|
|
+++ b/cmake/FuzzTestHelpers.cmake
|
|
@@ -114,6 +114,13 @@ function(fuzztest_cc_library)
|
|
${FUZZTEST_CC_LIB_LINKOPTS}
|
|
${FUZZTEST_DEFAULT_LINKOPTS}
|
|
)
|
|
+ if(APPLE)
|
|
+ set_target_properties(${_NAME} PROPERTIES
|
|
+ INSTALL_RPATH "@loader_path")
|
|
+ elseif(UNIX)
|
|
+ set_target_properties(${_NAME} PROPERTIES
|
|
+ INSTALL_RPATH "$ORIGIN")
|
|
+ endif()
|
|
|
|
set_property(
|
|
TARGET ${_NAME}
|
|
diff --git a/fuzztest/internal/CMakeLists.txt b/fuzztest/internal/CMakeLists.txt
|
|
index 61f6da8..84fe3a7 100644
|
|
--- a/fuzztest/internal/CMakeLists.txt
|
|
+++ b/fuzztest/internal/CMakeLists.txt
|
|
@@ -434,35 +434,6 @@ fuzztest_cc_library(
|
|
absl::cord
|
|
)
|
|
|
|
-fuzztest_cc_library(
|
|
- NAME
|
|
- subprocess
|
|
- HDRS
|
|
- "subprocess.h"
|
|
- SRCS
|
|
- "subprocess.cc"
|
|
- DEPS
|
|
- fuzztest::logging
|
|
- absl::flat_hash_map
|
|
- absl::function_ref
|
|
- absl::span
|
|
- absl::strings
|
|
- absl::string_view
|
|
- absl::time
|
|
-)
|
|
-
|
|
-fuzztest_cc_test(
|
|
- NAME
|
|
- subprocess_test
|
|
- SRCS
|
|
- "subprocess_test.cc"
|
|
- DEPS
|
|
- fuzztest::subprocess
|
|
- absl::strings
|
|
- absl::time
|
|
- GTest::gmock_main
|
|
-)
|
|
-
|
|
fuzztest_cc_library(
|
|
NAME
|
|
table_of_recent_compares
|
|
diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
|
|
index 79ada1a..124c76b 100644
|
|
--- a/tools/CMakeLists.txt
|
|
+++ b/tools/CMakeLists.txt
|
|
@@ -2,11 +2,21 @@ add_executable(
|
|
grammar_domain_code_generator
|
|
grammar_domain_code_generator.cc
|
|
)
|
|
-
|
|
target_link_libraries(
|
|
grammar_domain_code_generator
|
|
absl::flags
|
|
absl::flags_parse
|
|
fuzztest_logging
|
|
code_generation
|
|
-)
|
|
\ No newline at end of file
|
|
+)
|
|
+include(GNUInstallDirs)
|
|
+if(APPLE)
|
|
+ set_target_properties(grammar_domain_code_generator PROPERTIES
|
|
+ INSTALL_RPATH "@loader_path/../${CMAKE_INSTALL_LIBDIR};@loader_path")
|
|
+elseif(UNIX)
|
|
+ cmake_path(RELATIVE_PATH CMAKE_INSTALL_FULL_LIBDIR
|
|
+ BASE_DIRECTORY ${CMAKE_INSTALL_FULL_BINDIR}
|
|
+ OUTPUT_VARIABLE libdir_relative_path)
|
|
+ set_target_properties(grammar_domain_code_generator PROPERTIES
|
|
+ INSTALL_RPATH "$ORIGIN/${libdir_relative_path}:$ORIGIN")
|
|
+endif()
|