Skip to content

CMAKE_INSTALL_CMAKEDIR fix #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smanders merged 2 commits into from
Feb 10, 2026
Merged

CMAKE_INSTALL_CMAKEDIR fix #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59534cc
cmake: use CMAKE_INSTALL_CMAKEDIR if already defined
smanders Feb 10, 2026
fc78d67
Update release tag to xpv3.14.0.5
smanders Feb 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/release-tag.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
tag: xpv3.14.0.4
message: "xpro version 3.14.0.4 tag"
tag: xpv3.14.0.5
message: "xpro version 3.14.0.5 tag"
5 changes: 0 additions & 5 deletions cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,11 +140,6 @@ if(DEFINED XP_NAMESPACE)
else()
set(CMAKE_NAMESPACE protobuf)
set(CMAKE_OPT_INSTALL TRUE)
if(NOT MSVC)
set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/protobuf")
else()
set(CMAKE_INSTALL_CMAKEDIR "cmake")
endif()
endif()

add_definitions(-DGOOGLE_PROTOBUF_CMAKE_BUILD)
Expand Down
4 changes: 4 additions & 0 deletions cmake/install.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,15 @@ endforeach()

# Install configuration
set(_cmakedir_desc "Directory relative to CMAKE_INSTALL to install the cmake configuration files")
if(DEFINED CMAKE_INSTALL_CMAKEDIR)
set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_CMAKEDIR}" CACHE STRING "${_cmakedir_desc}")
else()
if(NOT MSVC)
set(CMAKE_INSTALL_CMAKEDIR "${CMAKE_INSTALL_LIBDIR}/cmake/protobuf" CACHE STRING "${_cmakedir_desc}")
else()
set(CMAKE_INSTALL_CMAKEDIR "cmake" CACHE STRING "${_cmakedir_desc}")
endif()
endif()
mark_as_advanced(CMAKE_INSTALL_CMAKEDIR)

configure_file(protobuf-config.cmake.in
Expand Down