Skip to content

Commit fe926d1

Browse files
Merge pull request #267 from ax3l/topic-removeFindHDF5
FindHDF5: Use Upstream CMake Version
2 parents 8f140b3 + da4e2f4 commit fe926d1

5 files changed

Lines changed: 6 additions & 386 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# and the GNU Lesser General Public License along with libSplash.
2020
# If not, see <http://www.gnu.org/licenses/>.
2121

22-
cmake_minimum_required(VERSION 2.8.5)
22+
cmake_minimum_required(VERSION 3.3.0)
2323

2424
IF(VAMPIR_ENABLE)
2525
MESSAGE("Building libSplash with VampirTrace support")
@@ -39,9 +39,6 @@ PROJECT(libSplash)
3939
SET(CMAKE_PREFIX_PATH "/usr/lib/x86_64-linux-gnu/" "$ENV{MPI_ROOT}"
4040
"$ENV{HDF5_ROOT}")
4141

42-
# own modules for find_packages
43-
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/ ${CMAKE_MODULE_PATH})
44-
4542
#-------------------------------------------------------------------------------
4643

4744
# install prefix

INSTALL.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Building libSplash **requires HDF5 in version 1.8.6** or higher.
1212
For **MPI based parallel output** configure HDF5 with `--enable-parallel`.
1313

1414
To use the CMakeLists.txt file which comes with the source code, you must have
15-
**CMake version 2.8.5** or higher installed.
15+
**CMake version 3.3.0** or higher installed.
1616

1717
The splashtools and some tests also require an **MPI 2.2** compatible MPI library,
1818
e.g. **OpenMPI 1.5.1** or higher.
@@ -72,8 +72,8 @@ cmake -DCMAKE_MODULE_PATH=. --help-module FindSplash | less
7272

7373
and use the following lines in your `CMakeLists.txt`:
7474
```cmake
75-
# this example will require at least CMake 2.8.5
76-
cmake_minimum_required(VERSION 2.8.5)
75+
# this example will require at least CMake 3.3.0
76+
cmake_minimum_required(VERSION 3.3.0)
7777
7878
# add path to FindSplash.cmake, e.g. in the directory in cmake/
7979
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/)

0 commit comments

Comments
 (0)