From d96e44b560f0f5133147714e63567b4271ee390c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= Date: Sat, 11 Feb 2023 15:48:10 +0100 Subject: [PATCH 1/2] [Cpp] CMake: use variables for specifying install paths consistently MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows overriding them if needed when the system uses different paths than usual (e.g. Haiku, which uses "develop/headers" for includes instead of "include"). Use the standard variable ${CMAKE_INSTALL_INCLUDEDIR} as the base path for the include directory. Signed-off-by: Joachim Mairböck --- runtime/Cpp/CMakeLists.txt | 6 +++--- runtime/Cpp/runtime/CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/runtime/Cpp/CMakeLists.txt b/runtime/Cpp/CMakeLists.txt index 7efb19c314..a1a180355c 100644 --- a/runtime/Cpp/CMakeLists.txt +++ b/runtime/Cpp/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/Cpp/runtime/CMakeLists.txt b/runtime/Cpp/runtime/CMakeLists.txt index be0d8bf039..09f8256420 100644 --- a/runtime/Cpp/runtime/CMakeLists.txt +++ b/runtime/Cpp/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 From 6ad5a974a8825c9e60ec0e958eeb77161d7d0834 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joachim=20Mairb=C3=B6ck?= Date: Sat, 11 Feb 2023 16:18:23 +0100 Subject: [PATCH 2/2] [Cpp] CMake: include GNUInstallDirs unconditionally to have CMAKE_INSTALL_DOCDIR available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Joachim Mairböck --- runtime/Cpp/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/runtime/Cpp/CMakeLists.txt b/runtime/Cpp/CMakeLists.txt index a1a180355c..863dd9d618 100644 --- a/runtime/Cpp/CMakeLists.txt +++ b/runtime/Cpp/CMakeLists.txt @@ -138,10 +138,11 @@ if(WITH_DEMO) add_subdirectory(demo) endif(WITH_DEMO) +include(GNUInstallDirs) + # Generate CMake Package Files only if install is active if (ANTLR4_INSTALL) - include(GNUInstallDirs) include(CMakePackageConfigHelpers) if(NOT ANTLR4_CMAKE_DIR)