From dc771113a6b7a3256672e72842a657c8e27f35a8 Mon Sep 17 00:00:00 2001 From: Vladislav Vaintroub Date: Tue, 5 Nov 2019 00:20:13 +0100 Subject: [PATCH] Fix ninja build Do not rely on existence of CMakeFiles/${target}.dir directory existence It is not there for custom targets in Ninja build. --- support-files/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt index 36d4c0949ed..62ad8bcffc9 100644 --- a/support-files/CMakeLists.txt +++ b/support-files/CMakeLists.txt @@ -77,11 +77,12 @@ IF(UNIX) IF(CHECKMODULE AND SEMODULE_PACKAGE) FOREACH(pol mariadb) SET(src ${CMAKE_CURRENT_SOURCE_DIR}/policy/selinux/${pol}.te) - SET(tmp ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/${pol}-pp.dir/${pol}.mod) + SET(tmp ${CMAKE_CURRENT_BINARY_DIR}/${pol}.mod) SET(out ${CMAKE_CURRENT_BINARY_DIR}/${pol}.pp) ADD_CUSTOM_COMMAND(OUTPUT ${out} COMMAND ${CHECKMODULE} -M -m ${src} -o ${tmp} COMMAND ${SEMODULE_PACKAGE} -m ${tmp} -o ${out} + COMMAND ${CMAKE_COMMAND} -E remove ${tmp} DEPENDS ${src}) ADD_CUSTOM_TARGET(${pol}-pp ALL DEPENDS ${out}) INSTALL(FILES ${out} DESTINATION ${inst_location}/policy/selinux COMPONENT SupportFiles)