Re #6201. Requiring NeXus v4.3.0.

mantidproject · Jan 30, 2013 · 1cea543 · 1cea543
1 parent 0f03d0f
commit 1cea543
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Code/Mantid/Build/CMake/CommonSetup.cmake b/Code/Mantid/Build/CMake/CommonSetup.cmake
@@ -50,7 +50,7 @@ add_definitions ( -DBOOST_DATE_TIME_POSIX_TIME_STD_CONFIG )
 find_package ( Poco REQUIRED )
 include_directories( SYSTEM ${POCO_INCLUDE_DIRS} )
 
-find_package ( Nexus REQUIRED )
+find_package ( Nexus 4.3.0 REQUIRED )
 include_directories ( SYSTEM ${NEXUS_INCLUDE_DIR} )
 
 find_package ( MuParser REQUIRED )

diff --git a/Code/Mantid/Build/CMake/FindNexus.cmake b/Code/Mantid/Build/CMake/FindNexus.cmake
@@ -37,4 +37,10 @@ endif()
 # Handle the QUIETLY and REQUIRED arguments and set NEXUS_FOUND to TRUE if 
 # all listed variables are TRUE
 include ( FindPackageHandleStandardArgs )
-find_package_handle_standard_args( Nexus DEFAULT_MSG NEXUS_LIBRARIES NEXUS_INCLUDE_DIR )
+if (NEXUS_VERSION)
+  find_package_handle_standard_args( Nexus REQUIRED_VARS NEXUS_LIBRARIES NEXUS_INCLUDE_DIR
+				     VERSION_VAR NEXUS_VERSION )
+else (NEXUS_VERSION)
+  message (status "Failed to determine version: Ignoring version requirement")
+  find_package_handle_standard_args( Nexus DEFAULT_MSG NEXUS_LIBRARIES NEXUS_INCLUDE_DIR )
+endif (NEXUS_VERSION)