From f319a8e2a4a735114860bed02a26fa504e7c5d62 Mon Sep 17 00:00:00 2001
From: Geert Janssens <geert@kobaltwit.be>
Date: Mon, 29 Jan 2018 19:15:02 +0100
Subject: [PATCH] Re-enable building a dist tarball from within distcheck

---
 CMakeLists.txt                           |  7 -------
 common/cmake_modules/MakeDistCheck.cmake | 12 ++++++------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 124f2932d62..283424ee2ad 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -781,10 +781,6 @@ endif()
 dist_add_generated(ChangeLog)
 
 ############################ BEGIN MAKE DIST #################
-# For now only enable the dist target when building from git
-# the generation of dist_generated should be improved to work
-# also when running from a tarball before that can be generalized.
-IF (BUILDING_FROM_VCS)
 
 SET(PACKAGE_PREFIX "${PACKAGE}-${PACKAGE_VERSION}")
 SET(DIST_FILE "${PACKAGE_PREFIX}.tar")
@@ -847,9 +843,6 @@ ADD_CUSTOM_TARGET(distcheck DEPENDS dist
             -P ${CMAKE_SOURCE_DIR}/common/cmake_modules/MakeDistCheck.cmake
         )
 
-
-
-ENDIF()
 ############################# END MAKE DIST #################
 
 # uninstall target
diff --git a/common/cmake_modules/MakeDistCheck.cmake b/common/cmake_modules/MakeDistCheck.cmake
index 3868aa22c14..100ff4fa442 100644
--- a/common/cmake_modules/MakeDistCheck.cmake
+++ b/common/cmake_modules/MakeDistCheck.cmake
@@ -76,12 +76,12 @@ FUNCTION(RUN_DIST_CHECK PACKAGE_PREFIX EXT)
             ERROR_MSG "Ninja check failed."
     )
 
-#    # Run ninja dist
-#    EXECUTE_PROCESS_AND_CHECK_RESULT(
-#            COMMAND ${MY_CMAKE_COMMAND} ${NINJA_COMMAND} dist
-#            WORKING_DIRECTORY ${BUILD_DIR}
-#            ERROR_MSG "Ninja dist failed."
-#    )
+    # Run ninja dist
+    EXECUTE_PROCESS_AND_CHECK_RESULT(
+            COMMAND ${MY_CMAKE_COMMAND} ${NINJA_COMMAND} dist
+            WORKING_DIRECTORY ${BUILD_DIR}
+            ERROR_MSG "Ninja dist failed."
+    )
 
     MESSAGE("distcheck complete.")