-
Notifications
You must be signed in to change notification settings - Fork 6.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[directxmath] Fix to support MSBuild usage (#42485)
- Loading branch information
Showing
5 changed files
with
52 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
From 994441ebfa63fe1440bf430c99b5ba3eaba02c66 Mon Sep 17 00:00:00 2001 | ||
From: Chuck Walbourn <chuckw@microsoft.com> | ||
Date: Tue, 26 Nov 2024 17:44:02 -0800 | ||
Subject: [PATCH] CMake update to avoid directxmath subdir for include | ||
|
||
--- | ||
CMakeLists.txt | 6 +++--- | ||
1 file changed, 3 insertions(+), 3 deletions(-) | ||
|
||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index d10adc1..7041f14 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -30,7 +30,7 @@ add_library(${PROJECT_NAME} INTERFACE) | ||
|
||
target_include_directories(${PROJECT_NAME} INTERFACE | ||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/Inc> | ||
- $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/directxmath>) | ||
+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>) | ||
|
||
target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_11) | ||
|
||
@@ -61,7 +61,7 @@ install(EXPORT ${PROJECT_NAME}-targets | ||
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME}) | ||
|
||
install(FILES ${LIBRARY_HEADERS} | ||
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/directxmath) | ||
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) | ||
|
||
install(FILES | ||
${CMAKE_CURRENT_BINARY_DIR}/${PACKAGE_NAME}-config.cmake | ||
@@ -71,7 +71,7 @@ install(FILES | ||
# Create pkg-config file | ||
include(build/JoinPaths.cmake) | ||
# from: https://github.com/jtojnar/cmake-snips#concatenating-paths-when-building-pkg-config-files | ||
-join_paths(DIRECTXMATH_INCLUDEDIR_FOR_PKG_CONFIG "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}/directxmath") | ||
+join_paths(DIRECTXMATH_INCLUDEDIR_FOR_PKG_CONFIG "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") | ||
join_paths(DIRECTXMATH_LIBDIR_FOR_PKG_CONFIG "\${prefix}" "${CMAKE_INSTALL_LIBDIR}") | ||
|
||
configure_file( | ||
-- | ||
2.47.0.vfs.0.3 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters