Commit 4fe46138 authored by Henderson, Shane's avatar Henderson, Shane
Browse files

Merge branch 'libpng' into 'master' 

Creates interface to libpng for writing PNG files

See merge request https://code.ornl.gov/futility/Futility/-/merge_requests/416
parents 61e39f07 a209aaa7

CMakeLists.txt

+13 −0
Original line number Diff line number Diff line
@@ -97,6 +97,19 @@ ELSE() 
      ${${PNAME}_ENABLE_HDF5_DEFAULT}

  )



  # Define Package dependent option for HDF5 TPL

  IF(TPL_ENABLE_PNG)

      SET(${PNAME}_ENABLE_PNG_DEFAULT ON)

  ELSE()

      SET(${PNAME}_ENABLE_PNG_DEFAULT OFF)

  ENDIF()

  TRIBITS_ADD_OPTION_AND_DEFINE(

      ${PNAME}_ENABLE_PNG

      HAVE_PNG

      "Enable use of PNG library."

      ${${PNAME}_ENABLE_PNG_DEFAULT}

  )



  # Define Package dependent option for PARDISO TPL

  IF(TPL_ENABLE_PARDISO)

      SET(${PNAME}_ENABLE_PARDISO_DEFAULT ON)

TPLsList.cmake

+1 −0
Original line number Diff line number Diff line
@@ -17,4 +17,5 @@ SET(Futility_TPLS_FINDMODS_CLASSIFICATIONS 
       PAPI     "${Futility_SOURCE_DIR}/cmake/tpl/"             SS

       SLEPC    "${Futility_SOURCE_DIR}/cmake/tpl/"             SS

       SUNDIALS "${Futility_SOURCE_DIR}/cmake/tpl/"             SS

       PNG      "${Futility_SOURCE_DIR}/cmake/tpl/"             SS

  )

cmake/Dependencies.cmake

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ SET(LIB_OPTIONAL_DEP_PACKAGES 
SET(TEST_REQUIRED_DEP_PACKAGES)

SET(TEST_OPTIONAL_DEP_PACKAGES)

SET(LIB_REQUIRED_DEP_TPLS)

SET(LIB_OPTIONAL_DEP_TPLS BLAS LAPACK MPI HYPRE PETSC PARDISO HDF5 PAPI SLEPC SUNDIALS)

SET(LIB_OPTIONAL_DEP_TPLS BLAS LAPACK MPI HYPRE PETSC PARDISO HDF5 PNG PAPI SLEPC SUNDIALS)

SET(TEST_REQUIRED_DEP_TPLS)

SET(TEST_OPTIONAL_DEP_TPLS MPI)

cmake/Futility_Defines.cmake

+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ IF(${PACKAGE_NAME}_ENABLE_HDF5) 
        MESSAGE(STATUS "Enabling HDF5")

    ENDIF()

ENDIF()

IF(${PACKAGE_NAME}_ENABLE_PNG)

   SET(${PACKAGE_NAME}_DEFINES ${${PACKAGE_NAME}_DEFINES} FUTILITY_HAVE_PNG)

   IF(${PACKAGE_NAME} STREQUAL "Futility")

        MESSAGE(STATUS "Enabling PNG")

    ENDIF()

ENDIF()

IF(${PACKAGE_NAME}_ENABLE_BLAS)

    SET(${PACKAGE_NAME}_DEFINES ${${PACKAGE_NAME}_DEFINES} HAVE_BLAS)

    IF(${PACKAGE_NAME} STREQUAL "Futility")

cmake/tpl/FindTPLPNG.cmake

0 → 100644
+13 −0
Original line number Diff line number Diff line 
#++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++!

#                          Futility Development Group                          !

#                             All rights reserved.                             !

#                                                                              !

# Futility is a jointly-maintained, open-source project between the University !

# of Michigan and Oak Ridge National Laboratory.  The copyright and license    !

# can be found in LICENSE.txt in the head directory of this repository.        !

#++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++!



TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( PNG

  REQUIRED_HEADERS png.h

  REQUIRED_LIBS_NAMES png)