mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-09 13:20:08 +02:00
87 lines
2.4 KiB
Plaintext
87 lines
2.4 KiB
Plaintext
From f7c2609eb1bc41165bc0608d6a1d139c5b4bd32f 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 be0d8bf..09f8256 100644
|
|
--- a/runtime/CMakeLists.txt
|
|
+++ b/runtime/CMakeLists.txt
|
|
@@ -7,7 +7,7 @@ if (NOT ANTLR_BUILD_SHARED AND NOT ANTLR_BUILD_STATIC)
|
|
message(FATAL_ERROR "Options ANTLR_BUILD_SHARED and ANTLR_BUILD_STATIC can't both be OFF")
|
|
endif()
|
|
|
|
-set(libantlrcpp_INCLUDE_INSTALL_DIR "include/antlr4-runtime")
|
|
+set(libantlrcpp_INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/antlr4-runtime")
|
|
|
|
set(libantlrcpp_INCLUDE_DIRS
|
|
${PROJECT_SOURCE_DIR}/runtime/src
|
|
--
|
|
2.45.2
|
|
|
|
|
|
From ac1344fed45b71be367a57ae8279623c33963ad2 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 09f8256..3d304f3 100644
|
|
--- a/runtime/CMakeLists.txt
|
|
+++ b/runtime/CMakeLists.txt
|
|
@@ -66,19 +66,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"
|
|
)
|
|
@@ -92,6 +79,7 @@ if (ANTLR_BUILD_CPP_TESTS)
|
|
antlr4_tests
|
|
$<IF:$<TARGET_EXISTS:antlr4_static>,antlr4_static,antlr4_shared>
|
|
gtest_main
|
|
+ gtest
|
|
)
|
|
|
|
include(GoogleTest)
|
|
--
|
|
2.45.2
|
|
|