CMake: libSplash 1.7.0+

Update CMake scripts to require libSplash 1.7.0+

Author: ax3l

include/picongpu/CMakeLists.txt

@@ -279,17 +279,16 @@ endif()
 # libSplash (+ hdf5 due to required headers)
 ################################################################################
 
-# find libSplash installation
-# prefer static libraries over shared ones (but do not force them)
-set(Splash_USE_STATIC_LIBS ON)
-find_package(Splash 1.6.0 COMPONENTS PARALLEL)
+find_package(Splash 1.7.0 CONFIG COMPONENTS PARALLEL)
 
-if(Splash_FOUND)
-    include_directories(SYSTEM ${Splash_INCLUDE_DIRS})
-    list(APPEND Splash_DEFINITIONS "-DENABLE_HDF5=1")
-    add_definitions(${Splash_DEFINITIONS})
-    set(LIBS ${LIBS} ${Splash_LIBRARIES})
-endif(Splash_FOUND)
+if(TARGET Splash::Splash)
+    add_definitions(-DENABLE_HDF5=1)
+    set(LIBS ${LIBS} Splash::Splash)
+    message(STATUS "Found Splash: ${Splash_DIR}")
+else()
+    message(STATUS "Could NOT find Splash - "
+                   "set Splash_DIR or check your CMAKE_PREFIX_PATH")
+endif()
 
 
 ################################################################################
@@ -302,6 +301,10 @@ find_package(PNGwriter 0.7.0 CONFIG)
 if(PNGwriter_FOUND)
     set(LIBS ${LIBS} PNGwriter::PNGwriter)
     add_definitions(-DPIC_ENABLE_PNG=1)
+    message(STATUS "Found PNGwriter: ${PNGwriter_DIR}")
+else()
+    message(STATUS "Could NOT find PNGwriter - "
+                   "set PNGwriter_DIR or check your CMAKE_PREFIX_PATH")
 endif(PNGwriter_FOUND)
 
 

src/tools/png2gas/CMakeLists.txt

@@ -96,16 +96,10 @@ endif()
 ################################################################################
 
 # find libSplash installation
-# prefer static libraries over shared ones (but do not force them)
-set(Splash_USE_STATIC_LIBS ON)
-find_package(Splash 1.6.0 REQUIRED COMPONENTS PARALLEL)
+find_package(Splash 1.7.0 REQUIRED CONFIG COMPONENTS PARALLEL)
 
-if(Splash_FOUND)
-    include_directories(SYSTEM ${Splash_INCLUDE_DIRS})
-    list(APPEND Splash_DEFINITIONS "-DENABLE_HDF5=1")
-    add_definitions(${Splash_DEFINITIONS})
-    set(LIBS ${LIBS} ${Splash_LIBRARIES})
-endif(Splash_FOUND)
+add_definitions(-DENABLE_HDF5=1)
+message(STATUS "Found Splash: ${Splash_DIR}")
 
 
 ################################################################################
@@ -115,9 +109,7 @@ endif(Splash_FOUND)
 # find PNGwriter installation
 find_package(PNGwriter 0.7.0 REQUIRED CONFIG)
 
-if(PNGwriter_FOUND)
-    set(LIBS ${LIBS} PNGwriter::PNGwriter)
-endif(PNGwriter_FOUND)
+set(LIBS ${LIBS} PNGwriter::PNGwriter)
 
 
 ################################################################################

src/tools/splash2txt/CMakeLists.txt

@@ -1,4 +1,3 @@
-#
 # Copyright 2013-2018 Felix Schmitt, Axel Huebl, Rene Widera
 #
 # This file is part of splash2txt.
@@ -100,17 +99,10 @@ endif(MPI_CXX_FOUND)
 ################################################################################
 
 # find libSplash installation
-# prefer static libraries over shared ones (but do not force them)
-set(Splash_USE_STATIC_LIBS ON)
-find_package(Splash 1.6.0 REQUIRED COMPONENTS PARALLEL)
+find_package(Splash 1.7.0 REQUIRED CONFIG COMPONENTS PARALLEL)
 
-if(Splash_FOUND)
-    include_directories(SYSTEM ${Splash_INCLUDE_DIRS})
-    list(APPEND Splash_DEFINITIONS "-DENABLE_HDF5=1")
-    add_definitions(${Splash_DEFINITIONS})
-    message(STATUS "libSplash compiler definitions: ${Splash_DEFINITIONS}")
-    set(LIBS ${LIBS} ${Splash_LIBRARIES})
-endif(Splash_FOUND)
+add_definitions(-DENABLE_HDF5=1)
+message(STATUS "Found Splash: ${Splash_DIR}")
 
 
 ################################################################################
@@ -148,9 +140,7 @@ endif()
 
 set(SRCFILES "splash2txt.cpp")
 
-if(Splash_FOUND)
-    list(APPEND SRCFILES "tools_splash_parallel.cpp")
-endif(Splash_FOUND)
+list(APPEND SRCFILES "tools_splash_parallel.cpp")
 if(ADIOS_FOUND)
     list(APPEND SRCFILES "tools_adios_parallel.cpp")
 endif(ADIOS_FOUND)