From 7f71c611cbc47539818eb73b02ee776e5d7a2637 Mon Sep 17 00:00:00 2001 From: Morgan Hardwood Date: Sun, 9 Apr 2017 16:10:29 +0200 Subject: [PATCH] CMake - Cleaner absolute path checking, #3678. --- CMakeLists.txt | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 30e1d1fc5..d1893ca33 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -217,19 +217,11 @@ endif() # Enforce absolute paths for non-bundle builds: if(NOT BUILD_BUNDLE) - if(NOT(IS_ABSOLUTE "${BINDIR}")) - message(FATAL_ERROR "The BINDIR path has to be absolute, or use -DBUILD_BUNDLE=ON") - elseif(NOT(IS_ABSOLUTE "${DATADIR}")) - message(FATAL_ERROR "The DATADIR path has to be absolute, or use -DBUILD_BUNDLE=ON") - elseif(NOT(IS_ABSOLUTE "${LIBDIR}")) - message(FATAL_ERROR "The LIBDIR path has to be absolute, or use -DBUILD_BUNDLE=ON") - elseif(NOT(IS_ABSOLUTE "${DOCDIR}")) - message(FATAL_ERROR "The DOCDIR path has to be absolute, or use -DBUILD_BUNDLE=ON") - elseif(NOT(IS_ABSOLUTE "${CREDITSDIR}")) - message(FATAL_ERROR "The CREDITSDIR path has to be absolute, or use -DBUILD_BUNDLE=ON") - elseif(NOT(IS_ABSOLUTE "${LICENCEDIR}")) - message(FATAL_ERROR "The LICENCEDIR path has to be absolute, or use -DBUILD_BUNDLE=ON") - endif() + foreach(path BINDIR DATADIR LIBDIR DOCDIR CREDITSDIR LICENCEDIR) + if(NOT (IS_ABSOLUTE "${${path}}")) + message (FATAL_ERROR "The ${path} path has to be absolute when using -DBUILD_BUNDLE=OFF") + endif() + endforeach() endif() # MyMutex: