From 92617e66d0b8dfd7b8fc7c7da293a4f21a91da8f Mon Sep 17 00:00:00 2001
From: Andre Bamidele <aybamidele@gmail.com>
Date: Mon, 6 Aug 2018 08:49:19 +0100
Subject: [PATCH] Re #23089 resolved cmakelists conflict
---
CMakeLists.txt | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b93cb6f8a0b..200adba2226 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,19 +48,17 @@ set_property(CACHE CPACK_PACKAGE_SUFFIX PROPERTY STRINGS nightly unstable "") #e
#Set package name here
set ( CPACK_PACKAGE_NAME "mantid${CPACK_PACKAGE_SUFFIX}" )
-
###########################################################################
# Bootstrap any dependencies
###########################################################################
include ( Bootstrap )
###########################################################################
-# Include Eigen as an external project
+# Configure Eigen early
###########################################################################
include ( Eigen )
###########################################################################
-
# Set ParaView information since later items depend on it
###########################################################################
# VATES flag. Requires ParaView
@@ -388,4 +386,4 @@ if ( ENABLE_CPACK )
include ( CPack )
# let people know what is coming out the other end - must be after cpack generates value for rpm
message ( STATUS "CPACK_PACKAGE_FILE_NAME = ${CPACK_PACKAGE_FILE_NAME}" )
-endif ()
+endif ()
\ No newline at end of file
--
GitLab