mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 13:20:08 +02:00
29d8bcb3c0
The patch for antlr_cpp that was taken from an upstream PR was merged, so it was dropped from the patchset.
87 lines
2.3 KiB
Plaintext
87 lines
2.3 KiB
Plaintext
From de9a87eee9cf13dce8f5dce4e6462d16634f33da Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
|
|
Date: Sun, 5 Feb 2023 20:55:24 +0100
|
|
Subject: fix install paths
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 7efb19c..a1a1803 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -202,14 +202,14 @@ endif(ANTLR4_INSTALL)
|
|
|
|
if(EXISTS LICENSE.txt)
|
|
install(FILES LICENSE.txt
|
|
- DESTINATION "share/doc/libantlr4")
|
|
+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
|
elseif(EXISTS ../../LICENSE.txt)
|
|
install(FILES ../../LICENSE.txt
|
|
- DESTINATION "share/doc/libantlr4")
|
|
+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
|
endif()
|
|
|
|
install(FILES README.md VERSION
|
|
- DESTINATION "share/doc/libantlr4")
|
|
+ DESTINATION ${CMAKE_INSTALL_DOCDIR})
|
|
|
|
set(CPACK_PACKAGE_CONTACT "antlr-discussion@googlegroups.com")
|
|
set(CPACK_PACKAGE_VERSION ${ANTLR_VERSION})
|
|
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
|
|
index c053fc3..a6d993c 100644
|
|
--- a/runtime/CMakeLists.txt
|
|
+++ b/runtime/CMakeLists.txt
|
|
@@ -183,7 +183,7 @@ if (TARGET antlr4_static)
|
|
endif()
|
|
|
|
install(DIRECTORY "${PROJECT_SOURCE_DIR}/runtime/src/"
|
|
- DESTINATION "include/antlr4-runtime"
|
|
+ DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/antlr4-runtime"
|
|
COMPONENT dev
|
|
FILES_MATCHING PATTERN "*.h"
|
|
)
|
|
--
|
|
2.37.3
|
|
|
|
|
|
From 0a5fad673bda6688e374bd956fee31dc3c3b5f72 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= <j.mairboeck@gmail.com>
|
|
Date: Sun, 5 Feb 2023 21:04:31 +0100
|
|
Subject: use packaged gtest
|
|
|
|
|
|
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
|
|
index a6d993c..db109f2 100644
|
|
--- a/runtime/CMakeLists.txt
|
|
+++ b/runtime/CMakeLists.txt
|
|
@@ -56,19 +56,6 @@ IF(TRACE_ATN)
|
|
ENDIF(TRACE_ATN)
|
|
|
|
if (ANTLR_BUILD_CPP_TESTS)
|
|
- include(FetchContent)
|
|
-
|
|
- FetchContent_Declare(
|
|
- googletest
|
|
- URL https://github.com/google/googletest/archive/e2239ee6043f73722e7aa812a459f54a28552929.zip
|
|
- )
|
|
-
|
|
- if(WITH_STATIC_CRT)
|
|
- set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
|
|
- endif()
|
|
-
|
|
- FetchContent_MakeAvailable(googletest)
|
|
-
|
|
file(GLOB libantlrcpp_TESTS
|
|
"${PROJECT_SOURCE_DIR}/runtime/tests/*.cpp"
|
|
)
|
|
@@ -82,6 +69,7 @@ if (ANTLR_BUILD_CPP_TESTS)
|
|
antlr4_tests
|
|
$<IF:$<TARGET_EXISTS:antlr4_static>,antlr4_static,antlr4_shared>
|
|
gtest_main
|
|
+ gtest
|
|
)
|
|
|
|
include(GoogleTest)
|
|
--
|
|
2.37.3
|
|
|