From 595fa8ca28b3e1457db98c3079bf7182f8412783 Mon Sep 17 00:00:00 2001 From: Justen Di Ruscio Date: Tue, 19 Mar 2024 15:43:01 -0300 Subject: [PATCH] correct unversioned header install dest. Prefix in src tree retained --- CMakeLists.txt | 2 +- jgd-cmake-modules/JcmStandardDirs.cmake | 2 +- vcpkg.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f129e01..fed369a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.24) project( jgd-cmake-modules - VERSION 3.4.1 + VERSION 3.4.2 DESCRIPTION "CMake library for standardized CMake projects for JGD" HOMEPAGE_URL "https://jgd-solutions.github.io/jgd-cmake-modules/" LANGUAGES NONE) diff --git a/jgd-cmake-modules/JcmStandardDirs.cmake b/jgd-cmake-modules/JcmStandardDirs.cmake index e93f5c4..3c6e2b6 100644 --- a/jgd-cmake-modules/JcmStandardDirs.cmake +++ b/jgd-cmake-modules/JcmStandardDirs.cmake @@ -68,7 +68,7 @@ set(JCM_UNVERSIONED_INSTALL_CMAKE_DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/${PR # interface include directory for exported targets in installation set(JCM_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${_jcm_name_version}") -set(JCM_UNVERSIONED_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME}") +set(JCM_UNVERSIONED_INSTALL_INCLUDE_DIR "${CMAKE_INSTALL_INCLUDEDIR}") set(JCM_INSTALL_DOC_DIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${_jcm_name_version}") set(JCM_UNVERSIONED_INSTALL_DOC_DIR "${CMAKE_INSTALL_DATAROOTDIR}/doc/${PROJECT_NAME}") diff --git a/vcpkg.json b/vcpkg.json index 7d757b9..94aba32 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -1,6 +1,6 @@ { "name": "jgd-cmake-modules", - "version": "3.4.1", + "version": "3.4.2", "description": "CMake library for standardized CMake projects for JGD", "homepage": "https://jgd-solutions.github.io/jgd-cmake-modules/", "dependencies": []