Docs: [email protected] [email protected]

Due to a server bug in `FindHDF5.cmake` and new versions of
libSplash requiring it (1.7.0+) we bump our CMake dependency to
3.10.0+

Author: ax3l

INSTALL.rst

@@ -48,7 +48,7 @@ gcc
 
 CMake
 """""
-- 3.7.0 or higher
+- 3.10.0 or higher
 - *Debian/Ubuntu:* ``sudo apt-get install cmake file cmake-curses-gui``
 - *Arch Linux:* ``sudo pacman --sync cmake``
 - *Spack:* ``spack install cmake``
@@ -171,12 +171,12 @@ pngwriter
 
   - *environment:* (assumes install from source in ``$HOME/lib/pngwriter``)
 
-    - ``export PNGWRITER_ROOT=$HOME/lib/pngwriter``
-    - ``export LD_LIBRARY_PATH=$PNGWRITER_ROOT/lib:$LD_LIBRARY_PATH``
+    - ``export CMAKE_PREFIX_PATH=$HOME/lib/pngwriter:$CMAKE_PREFIX_PATH``
+    - ``export LD_LIBRARY_PATH=$HOME/lib/pngwriter/lib:$LD_LIBRARY_PATH``
 
 libSplash
 """""""""
-- 1.6.0+ (requires *HDF5*, *boost program-options*)
+- 1.7.0+ (requires *HDF5*, *boost program-options*)
 - *Debian/Ubuntu dependencies:* ``sudo apt-get install libhdf5-openmpi-dev libboost-program-options-dev``
 - *Arch Linux dependencies:* ``sudo pacman --sync hdf5-openmpi boost``
 - *Spack:* ``spack install libsplash ^hdf5~fortran``
@@ -185,13 +185,13 @@ libSplash
   - ``mkdir -p ~/src ~/build ~/lib``
   - ``git clone https://github.com/ComputationalRadiationPhysics/libSplash.git ~/src/splash/``
   - ``cd ~/build``
-  - ``cmake -DCMAKE_INSTALL_PREFIX=$HOME/lib/splash ~/src/splash``
+  - ``cmake -DCMAKE_INSTALL_PREFIX=$HOME/lib/splash -DSplash_USE_MPI=ON -DSplash_USE_PARALLE=ON ~/src/splash``
   - ``make install``
 
 - *environment:* (assumes install from source in ``$HOME/lib/splash``)
 
-  - ``export SPLASH_ROOT=$HOME/lib/splash``
-  - ``export LD_LIBRARY_PATH=$SPLASH_ROOT/lib:$LD_LIBRARY_PATH``
+  - ``export CMAKE_PREFIX_PATH=$HOME/lib/splash:$CMAKE_PREFIX_PATH``
+  - ``export LD_LIBRARY_PATH=$HOME/lib/splash/lib:$LD_LIBRARY_PATH``
 
 HDF5
 """"

buildsystem/CompileSuite/autoTests/new_commits.sh

@@ -94,7 +94,7 @@ touch "$thisDir"runGuard
             #export PIC_COMPILE_SUITE_CMAKE="-DPIC_ENABLE_PNG=OFF -DALPAKA_CUDA_ARCH=35"
             export PIC_BACKEND="cuda"
             . /etc/profile
-            module load gcc/4.9.4 boost/1.62.0 cmake/3.7.0 cuda/8.0.44 openmpi/1.10.4
+            module load gcc/4.9.4 boost/1.62.0 cmake/3.10.0 cuda/8.0.44 openmpi/1.10.4
             module load libSplash/1.6.0 adios/1.10.0
             module load pngwriter/0.7.0 rivlib/1.0.2
             module load libjpeg-turbo/1.5.1 icet/2.1.1 jansson/2.9 isaac/1.1.0

include/mpiInfo/CMakeLists.txt

@@ -22,7 +22,7 @@
 # Required cmake version
 ################################################################################
 
-cmake_minimum_required(VERSION 3.7.0)
+cmake_minimum_required(VERSION 3.10.0)
 
 
 ################################################################################

include/picongpu/CMakeLists.txt

@@ -22,7 +22,7 @@
 # Required cmake version
 ################################################################################
 
-cmake_minimum_required(VERSION 3.7.0)
+cmake_minimum_required(VERSION 3.10.0)
 
 
 ################################################################################

include/pmacc/CMakeLists.txt

@@ -24,7 +24,7 @@
 # PMacc tests
 ################################################################################
 
-cmake_minimum_required(VERSION 3.7.0)
+cmake_minimum_required(VERSION 3.10.0)
 project(PMaccTest)
 
 # set helper pathes to find libraries and packages

include/pmacc/PMaccConfig.cmake

@@ -29,7 +29,7 @@
 ###############################################################################
 # PMacc
 ###############################################################################
-cmake_minimum_required(VERSION 3.7.0)
+cmake_minimum_required(VERSION 3.10.0)
 
 # set helper pathes to find libraries and packages
 # Add specific hints

include/pmacc/test/random/CMakeLists.txt

@@ -19,7 +19,7 @@
 # If not, see <http://www.gnu.org/licenses/>.
 #
 
-cmake_minimum_required(VERSION 3.7.0)
+cmake_minimum_required(VERSION 3.10.0)
 project("TestRandomGenerators")
 
 set(CMAKE_PREFIX_PATH ${CMAKE_PREFIX_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/../..")

share/pmacc/examples/gameOfLife2D/CMakeLists.txt

@@ -23,7 +23,7 @@
 # Required cmake version
 ################################################################################
 
-cmake_minimum_required(VERSION 3.7.0)
+cmake_minimum_required(VERSION 3.10.0)
 
 
 ################################################################################

src/tools/png2gas/CMakeLists.txt

@@ -22,7 +22,7 @@
 # Required cmake version
 ################################################################################
 
-cmake_minimum_required(VERSION 3.7.0)
+cmake_minimum_required(VERSION 3.10.0)
 
 
 ################################################################################

src/tools/splash2txt/CMakeLists.txt

@@ -23,7 +23,7 @@
 # Required cmake version
 ################################################################################
 
-cmake_minimum_required(VERSION 3.7.0)
+cmake_minimum_required(VERSION 3.10.0)
 
 
 ################################################################################