Skip to content

Commit 3233cd6

Browse files
Fix CMake 4.2 dev warnings
- Normalize install() DESTINATION for platform interface headers - Add PRE_BUILD to format validation targets
1 parent acb6ac0 commit 3233cd6

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

BuildTools/CMake/BuildUtils.cmake

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,7 @@ function(add_format_validation_target MODULE_NAME MODULE_ROOT_PATH IDE_FOLDER)
486486
if (NOT ("${DILIGENT_CORE_SOURCE_DIR}" STREQUAL "${MODULE_ROOT_PATH}"))
487487
# Start by copying .clang-format file to the module's root folder
488488
add_custom_command(TARGET ${MODULE_NAME}-ValidateFormatting
489+
PRE_BUILD
489490
COMMAND ${CMAKE_COMMAND} -E copy_if_different "${DILIGENT_CORE_SOURCE_DIR}/.clang-format" "${MODULE_ROOT_PATH}/.clang-format"
490491
)
491492
endif()
@@ -501,6 +502,7 @@ function(add_format_validation_target MODULE_NAME MODULE_ROOT_PATH IDE_FOLDER)
501502
if (RUN_VALIDATION_SCRIPT)
502503
# Run the format validation script
503504
add_custom_command(TARGET ${MODULE_NAME}-ValidateFormatting
505+
PRE_BUILD
504506
COMMAND ${RUN_VALIDATION_SCRIPT}
505507
WORKING_DIRECTORY "${MODULE_ROOT_PATH}/BuildTools/FormatValidation"
506508
COMMENT "Validating ${MODULE_NAME} module's source code formatting..."

Platforms/Basic/CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,9 @@ set_target_properties(Diligent-BasicPlatform PROPERTIES
5151

5252
if(DILIGENT_INSTALL_CORE)
5353
install_core_lib(Diligent-BasicPlatform)
54-
get_target_relative_dir(Diligent-BasicPlatform BASIC_PLATFORM_DIR)
54+
get_target_relative_dir(Diligent-BasicPlatform BASIC_PLATFORM_DIR) # DiligentCore/Platforms/BasicPlatform
55+
cmake_path(GET BASIC_PLATFORM_DIR PARENT_PATH PLATFORMS_DIR) # DiligentCore/Platforms
5556
install(DIRECTORY "../interface"
56-
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${BASIC_PLATFORM_DIR}/../"
57+
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/${PLATFORMS_DIR}"
5758
)
5859
endif()

0 commit comments

Comments
 (0)