summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorVladislav Vaintroub <wlad@mariadb.com>2019-11-05 00:20:13 +0100
committerVladislav Vaintroub <wlad@mariadb.com>2019-11-05 00:20:13 +0100
commitdc771113a6b7a3256672e72842a657c8e27f35a8 (patch)
tree27688cce641dd1ec5c289c0acaaeb64495ef6318 /support-files
parent5164f8c206e48c00aba2ec3007f309e3840c12eb (diff)
downloadmariadb-git-dc771113a6b7a3256672e72842a657c8e27f35a8.tar.gz
Fix ninja build
Do not rely on existence of CMakeFiles/${target}.dir directory existence It is not there for custom targets in Ninja build.
Diffstat (limited to 'support-files')
-rw-r--r--support-files/CMakeLists.txt3
1 files changed, 2 insertions, 1 deletions
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)