Skip to content

Commit

Permalink
refs #6332. Change min required version of cmake
Browse files Browse the repository at this point in the history
Changed to be >= 2.8.5.
This is so we can use the HDF5 HL libraries
  • Loading branch information
stuartcampbell committed Dec 20, 2012
1 parent f83dcaf commit fcaf361
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 8 deletions.
9 changes: 2 additions & 7 deletions Code/Mantid/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
###########################################################################
# CMake version check.
# Windows requires 2.8.3 with a fix with the FindZLib module
# everywhere else anything from the 2.8 series will do
# Only versions after 2.8.5 will find the HL component for HDF5
###########################################################################
if ( WIN32 )
cmake_minimum_required ( VERSION 2.8.3 )
else()
cmake_minimum_required ( VERSION 2.8 )
endif ()
cmake_minimum_required ( VERSION 2.8.5 )

# System package target is important for the windows builds as it allows us to package only the dlls and exes and exclude libs. Defaults to empty for other platforms.
set ( SYSTEM_PACKAGE_TARGET "")
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# This is mainly here so you don't get a complaint when running cmake
cmake_minimum_required (VERSION 2.8)
cmake_minimum_required (VERSION 2.8.5)

# Add the path to our custom 'find' modules
set ( CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../Build/CMake")
Expand Down

0 comments on commit fcaf361

Please sign in to comment.