From 39143cc15ae6bf581fdc184fde5c2b5263ace01f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Ke=C3=9Fler?= Date: Tue, 1 Oct 2024 19:38:16 +0200 Subject: [PATCH] Fix explicit CMAKE_INSTALL_PREFIX usages (#5500) --- CMakeLists.txt | 15 ++++++++------- docs/CONTRIBUTORS | 1 + 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 88afe9d75..1441820cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,8 @@ option( find_package(Python3 COMPONENTS Interpreter) set(PYTHON3 ${Python3_EXECUTABLE}) -set(CMAKE_INSTALL_DATADIR ${CMAKE_INSTALL_PREFIX}) +# See also CMake built-in; CMAKE_INSTALL_PREFIX is applied by the install command. +set(CMAKE_INSTALL_DATADIR .) include(GNUInstallDirs) include(CMakePackageConfigHelpers) include(CheckStructHasMember) @@ -115,33 +116,33 @@ configure_file(include/verilated.mk.in include/verilated.mk @ONLY) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/include/verilated_config.h - DESTINATION ${CMAKE_INSTALL_PREFIX}/include + DESTINATION include ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/include/verilated.mk - DESTINATION ${CMAKE_INSTALL_PREFIX}/include + DESTINATION include ) configure_package_config_file( verilator-config.cmake.in verilator-config.cmake - INSTALL_DESTINATION ${CMAKE_INSTALL_PREFIX} + INSTALL_DESTINATION . ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/verilator-config.cmake - DESTINATION ${CMAKE_INSTALL_PREFIX} + DESTINATION . ) configure_package_config_file( verilator-config-version.cmake.in verilator-config-version.cmake - INSTALL_DESTINATION ${CMAKE_INSTALL_PREFIX} + INSTALL_DESTINATION . ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/verilator-config-version.cmake - DESTINATION ${CMAKE_INSTALL_PREFIX} + DESTINATION . ) foreach( diff --git a/docs/CONTRIBUTORS b/docs/CONTRIBUTORS index 6166485e7..e1bb69c5a 100644 --- a/docs/CONTRIBUTORS +++ b/docs/CONTRIBUTORS @@ -47,6 +47,7 @@ Edgar E. Iglesias Eric Rippey Ethan Sifferman Eyck Jentzsch +Fabian Keßler Fan Shupei february cozzocrea Felix Neumärker