diff --git a/CMakeLists.txt b/CMakeLists.txt
index b5865aa9bb9feef69cb2a22e05caf428c1952ca5..6878c9a0de25c77d51ce974a5615b6e2d821c3bb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,11 +2,13 @@ cmake_minimum_required (VERSION 3.10)
# CMake utils
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/packages/cmake-modules")
# Forbids in-source builds
include(CheckNotInSources)
+# use PkgConfig to find packages
+find_package(PkgConfig REQUIRED)
+
#------------------------------------------------------
#----------------- Main configuration -----------------
#------------------------------------------------------
@@ -154,24 +156,21 @@ set(PUGS_ENABLE_PETSC AUTO CACHE STRING
"Choose one of: AUTO ON OFF")
if (PUGS_ENABLE_PETSC MATCHES "^(AUTO|ON)$")
- if (${CMAKE_VERSION} VERSION_GREATER "3.12")
- cmake_policy(SET CMP0075 OLD)
- endif()
- find_package(PETSc)
+ pkg_check_modules(PETSC PETSc)
+
set(PUGS_HAS_PETSC ${PETSC_FOUND})
else()
unset(PUGS_HAS_PETSC)
endif()
if (${PETSC_FOUND})
- include_directories(SYSTEM ${PETSC_INCLUDES})
+ include_directories(SYSTEM ${PETSC_INCLUDE_DIRS})
else()
if (PUGS_ENABLE_PETSC MATCHES "^ON$")
message(FATAL_ERROR "Could not find PETSc!")
endif()
endif()
-
# -----------------------------------------------------
if (${MPI_FOUND})
diff --git a/packages/cmake-modules/.gitrepo b/packages/cmake-modules/.gitrepo
deleted file mode 100644
index 40d20d1839ad63c531af16567f906d2042f3e2f7..0000000000000000000000000000000000000000
--- a/packages/cmake-modules/.gitrepo
+++ /dev/null
@@ -1,12 +0,0 @@
-; DO NOT EDIT (unless you know what you are doing)
-;
-; This subdirectory is a git "subrepo", and this file is maintained by the
-; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
-;
-[subrepo]
- remote = https://github.com/jedbrown/cmake-modules.git
- branch = master
- commit = 91f96174a8b3f65e19519fa592b1571391c0e3d0
- parent = 14615ef666ef3a26dcccd36f0a357b493e6cfbe5
- method = merge
- cmdver = 0.4.1
diff --git a/packages/cmake-modules/CorrectWindowsPaths.cmake b/packages/cmake-modules/CorrectWindowsPaths.cmake
deleted file mode 100644
index 09bcdd67dcd04fd001d2b7acbd904b5014ebe42b..0000000000000000000000000000000000000000
--- a/packages/cmake-modules/CorrectWindowsPaths.cmake
+++ /dev/null
@@ -1,14 +0,0 @@
-# CorrectWindowsPaths - this module defines one macro
-#
-# CONVERT_CYGWIN_PATH( PATH )
-# This uses the command cygpath (provided by cygwin) to convert
-# unix-style paths into paths useable by cmake on windows
-
-macro (CONVERT_CYGWIN_PATH _path)
- if (WIN32)
- EXECUTE_PROCESS(COMMAND cygpath.exe -m ${${_path}}
- OUTPUT_VARIABLE ${_path})
- string (STRIP ${${_path}} ${_path})
- endif (WIN32)
-endmacro (CONVERT_CYGWIN_PATH)
-
diff --git a/packages/cmake-modules/FindFFTW.cmake b/packages/cmake-modules/FindFFTW.cmake
deleted file mode 100644
index 00c3401c11d7b32871290d4a4d2e9e9717411962..0000000000000000000000000000000000000000
--- a/packages/cmake-modules/FindFFTW.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-# - Find FFTW
-# Find the native FFTW includes and library
-#
-# FFTW_INCLUDES - where to find fftw3.h
-# FFTW_LIBRARIES - List of libraries when using FFTW.
-# FFTW_FOUND - True if FFTW found.
-
-if (FFTW_INCLUDES)
- # Already in cache, be silent
- set (FFTW_FIND_QUIETLY TRUE)
-endif (FFTW_INCLUDES)
-
-find_path (FFTW_INCLUDES fftw3.h)
-
-find_library (FFTW_LIBRARIES NAMES fftw3)
-
-# handle the QUIETLY and REQUIRED arguments and set FFTW_FOUND to TRUE if
-# all listed variables are TRUE
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (FFTW DEFAULT_MSG FFTW_LIBRARIES FFTW_INCLUDES)
-
-mark_as_advanced (FFTW_LIBRARIES FFTW_INCLUDES)
diff --git a/packages/cmake-modules/FindGSL.cmake b/packages/cmake-modules/FindGSL.cmake
deleted file mode 100644
index 64a578fa6904af76e113c7b5d2b1e2ae74e630d7..0000000000000000000000000000000000000000
--- a/packages/cmake-modules/FindGSL.cmake
+++ /dev/null
@@ -1,32 +0,0 @@
-# - Find GSL
-# Find the native GSL includes and library
-#
-# GSL_INCLUDES - where to find gsl/gsl_*.h, etc.
-# GSL_LIBRARIES - List of libraries when using GSL.
-# GSL_FOUND - True if GSL found.
-
-
-if (GSL_INCLUDES)
- # Already in cache, be silent
- set (GSL_FIND_QUIETLY TRUE)
-endif (GSL_INCLUDES)
-
-find_path (GSL_INCLUDES gsl/gsl_math.h)
-
-find_library (GSL_LIB NAMES gsl)
-
-set (GSL_CBLAS_LIB "" CACHE FILEPATH "If your program fails to link
-(usually because GSL is not automatically linking a CBLAS and no other
-component of your project provides a CBLAS) then you may need to point
-this variable to a valid CBLAS. Usually GSL is distributed with
-libgslcblas.{a,so} (next to GSL_LIB) which you may use if an optimized
-CBLAS is unavailable.")
-
-set (GSL_LIBRARIES "${GSL_LIB}" "${GSL_CBLAS_LIB}")
-
-# handle the QUIETLY and REQUIRED arguments and set GSL_FOUND to TRUE if
-# all listed variables are TRUE
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (GSL DEFAULT_MSG GSL_LIBRARIES GSL_INCLUDES)
-
-mark_as_advanced (GSL_LIB GSL_CBLAS_LIB GSL_INCLUDES)
diff --git a/packages/cmake-modules/FindGit.cmake b/packages/cmake-modules/FindGit.cmake
deleted file mode 100644
index 05c9bf0be638ad2049c8fbf6a260dd2f43270e8f..0000000000000000000000000000000000000000
--- a/packages/cmake-modules/FindGit.cmake
+++ /dev/null
@@ -1,34 +0,0 @@
-SET(Git_FOUND FALSE)
-
-FIND_PROGRAM(Git_EXECUTABLE git
- DOC "git command line client")
-MARK_AS_ADVANCED(Git_EXECUTABLE)
-
-IF(Git_EXECUTABLE)
- SET(Git_FOUND TRUE)
- MACRO(Git_WC_INFO dir prefix)
- EXECUTE_PROCESS(COMMAND ${Git_EXECUTABLE} rev-list -n 1 HEAD
- WORKING_DIRECTORY ${dir}
- ERROR_VARIABLE Git_error
- OUTPUT_VARIABLE ${prefix}_WC_REVISION_HASH
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(NOT ${Git_error} EQUAL 0)
- MESSAGE(SEND_ERROR "Command \"${Git_EXECUTBALE} rev-list -n 1 HEAD\" in directory ${dir} failed with output:\n${Git_error}")
- ELSE(NOT ${Git_error} EQUAL 0)
- EXECUTE_PROCESS(COMMAND ${Git_EXECUTABLE} name-rev ${${prefix}_WC_REVISION_HASH}
- WORKING_DIRECTORY ${dir}
- OUTPUT_VARIABLE ${prefix}_WC_REVISION_NAME
- OUTPUT_STRIP_TRAILING_WHITESPACE)
- ENDIF(NOT ${Git_error} EQUAL 0)
- ENDMACRO(Git_WC_INFO)
-ENDIF(Git_EXECUTABLE)
-
-IF(NOT Git_FOUND)
- IF(NOT Git_FIND_QUIETLY)
- MESSAGE(STATUS "Git was not found")
- ELSE(NOT Git_FIND_QUIETLY)
- if(Git_FIND_REQUIRED)
- MESSAGE(FATAL_ERROR "Git was not found")
- ENDIF(Git_FIND_REQUIRED)
- ENDIF(NOT Git_FIND_QUIETLY)
-ENDIF(NOT Git_FOUND)
diff --git a/packages/cmake-modules/FindITAPS.cmake b/packages/cmake-modules/FindITAPS.cmake
deleted file mode 100644
index 91ba0ca2139ace6c04bf4df4b76e8845c2e44d90..0000000000000000000000000000000000000000
--- a/packages/cmake-modules/FindITAPS.cmake
+++ /dev/null
@@ -1,187 +0,0 @@
-# - Try to find ITAPS
-#
-# This will define
-#
-# ITAPS_FOUND - Requested components were found
-# ITAPS_INCLUDES - Includes for all available components
-# ITAPS_LIBRARIES - Libraries for all available components
-#
-# ITAPS_MESH_FOUND - System has iMesh
-# ITAPS_MESH_INCLUDES - The iMesh include directory
-# ITAPS_MESH_LIBRARIES - Link these to use iMesh
-#
-# ITAPS_GEOM_FOUND - System has iGeom
-# ITAPS_GEOM_INCLUDES - The iGeom include directory
-# ITAPS_GEOM_LIBRARIES - Link these to use iGeom
-#
-# ITAPS_REL_FOUND - System has iRel
-# ITAPS_REL_INCLUDES - The iRel include directory
-# ITAPS_REL_LIBRARIES - Link these to use iRel
-#
-# Setting this changes the behavior of the search
-# ITAPS_MESH_DEFS_FILE - path to iMesh-Defs.inc
-# ITAPS_GEOM_DEFS_FILE - path to iGeom-Defs.inc
-# ITAPS_REL_DEFS_FILE - path to iRel-Defs.inc
-#
-# If any of these variables are in your environment, they will be used as hints
-# IMESH_DIR - directory in which iMesh resides
-# IGEOM_DIR - directory in which iGeom resides
-# IREL_DIR - directory in which iRel resides
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-include (FindPackageMultipass)
-include (ResolveCompilerPaths)
-include (CheckCSourceRuns)
-include (FindPackageHandleStandardArgs)
-
-find_program (MAKE_EXECUTABLE NAMES make gmake)
-
-macro (ITAPS_PREPARE_COMPONENT component name)
- find_file (ITAPS_${component}_DEFS_FILE ${name}-Defs.inc
- HINTS ENV I${component}_DIR
- PATH_SUFFIXES lib64 lib)
- # If ITAPS_XXX_DEFS_FILE has changed, the library will be found again
- find_package_multipass (ITAPS_${component} itaps_${component}_config_current
- STATES DEFS_FILE
- DEPENDENTS INCLUDES LIBRARIES EXECUTABLE_RUNS)
-endmacro ()
-
-macro (ITAPS_GET_VARIABLE makefile name var)
- set (${var} "NOTFOUND" CACHE INTERNAL "Cleared" FORCE)
- execute_process (COMMAND ${MAKE_EXECUTABLE} -f ${${makefile}} show VARIABLE=${name}
- OUTPUT_VARIABLE ${var}
- RESULT_VARIABLE itaps_return)
-endmacro (ITAPS_GET_VARIABLE)
-
-macro (ITAPS_TEST_RUNS component name includes libraries program runs)
- # message (STATUS "Starting run test: ${includes} ${libraries} ${runs}")
- multipass_c_source_runs ("${includes}" "${libraries}" "${program}" ${runs})
- if (NOT ITAPS_${component}_EXECUTABLE_RUNS)
- set (ITAPS_${component}_EXECUTABLE_RUNS "${${runs}}" CACHE BOOL
- "Can the system successfully run an ${name} executable? This variable can be manually set to \"YES\" to force CMake to accept a given configuration, but this will almost always result in a broken build." FORCE)
- endif ()
-endmacro (ITAPS_TEST_RUNS)
-
-macro (ITAPS_REQUIRED_LIBS component name includes libraries_all program libraries_required)
- # message (STATUS "trying program: ${program}")
- resolve_libraries (_all_libraries "${libraries_all}")
- list (GET _all_libraries 0 _first_library)
- itaps_test_runs (${component} ${name} "${includes}" "${_first_library};${itaps_rel_libs}" "${program}" ${name}_works_minimal)
- if (${name}_works_minimal)
- set (${libraries_required} "${_first_library}")
- message (STATUS "${name} executable works when only linking to the interface lib, this probably means you have shared libs.")
- else ()
- itaps_test_runs (${component} ${name} "${includes}" "${_all_libraries};${itaps_rel_libs}" "${itaps_mesh_program}" ${name}_works_extra)
- if (${name}_works_extra)
- set (${libraries_required} "${_all_libraries}")
- message (STATUS "${name} executable requires linking to extra libs, this probably means it's statically linked.")
- else ()
- message (STATUS "${name} could not be used, maybe the install is broken.")
- endif ()
- endif ()
-endmacro ()
-
-macro (ITAPS_HANDLE_COMPONENT component name program)
- itaps_prepare_component ("${component}" "${name}")
- if (ITAPS_${component}_DEFS_FILE AND NOT itaps_${component}_config_current)
- # A temporary makefile to probe this ITAPS components's configuration
- set (itaps_config_makefile "${PROJECT_BINARY_DIR}/Makefile.${name}")
- file (WRITE ${itaps_config_makefile}
- "## This file was autogenerated by FindITAPS.cmake
-include ${ITAPS_${component}_DEFS_FILE}
-show :
-\t-@echo -n \${\${VARIABLE}}")
- itaps_get_variable (itaps_config_makefile I${component}_INCLUDEDIR itaps_includedir)
- itaps_get_variable (itaps_config_makefile I${component}_LIBS itaps_libs)
- file (REMOVE ${itaps_config_makefile})
- find_path (itaps_include_tmp ${name}.h HINTS ${itaps_includedir} NO_DEFAULT_PATH)
- set (ITAPS_${component}_INCLUDES "${itaps_include_tmp}" CACHE STRING "Include directories for ${name}")
- set (itaps_include_tmp "NOTFOUND" CACHE INTERNAL "Cleared" FORCE)
- itaps_required_libs ("${component}" "${name}" "${ITAPS_${component}_INCLUDES}" "${itaps_libs}" "${program}" itaps_${component}_required_libraries)
- set (ITAPS_${component}_LIBRARIES "${itaps_${component}_required_libraries}" CACHE STRING "Libraries for ${name}")
- mark_as_advanced (ITAPS_${component}_EXECUTABLE_RUNS ITAPS_${component}_LIBRARIES)
- endif()
- set (ITAPS_${component}_FOUND "${ITAPS_${component}_EXECUTABLE_RUNS}")
-endmacro()
-
-itaps_handle_component (MESH iMesh "
-/* iMesh test program */
-#include <iMesh.h>
-#define CHK(err) if (err) return 1
-int main(int argc,char *argv[]) {
- int err;
- iMesh_Instance m;
- iMesh_newMesh(\"\",&m,&err,0);CHK(err);
- iMesh_dtor(m,&err);CHK(err);
- return 0;
-}
-")
-find_path (imesh_include_tmp iMeshP.h HINTS ${ITAPS_MESH_INCLUDES} NO_DEFAULT_PATH)
-if (imesh_include_tmp)
- set (ITAPS_MESH_HAS_PARALLEL "YES")
-else ()
- set (ITAPS_MESH_HAS_PARALLEL "NO")
-endif ()
-set (imesh_include_tmp "NOTFOUND" CACHE INTERNAL "Cleared" FORCE)
-
-set (itaps_rel_libs) # Extra libraries which should only be set when linking with iRel
-
-itaps_handle_component (GEOM iGeom "
-/* iGeom test program */
-#include <iGeom.h>
-#define CHK(err) if (err) return 1
-int main() {
- int ierr;
- iGeom_Instance g;
- iGeom_newGeom(\"\",&g,&ierr,0);CHK(ierr);
- iGeom_dtor(g,&ierr);CHK(ierr);
- return 0;
-}
-")
-
-if (ITAPS_MESH_FOUND AND ITAPS_GEOM_FOUND) # iRel only makes sense if iMesh and iGeom are found
- set (itaps_rel_libs "${ITAPS_MESH_LIBRARIES}" "${ITAPS_GEOM_LIBRARIES}")
- itaps_handle_component (REL iRel "
-/* iRel test program */
-#include <iRel.h>
-#define CHK(err) if (err) return 1
-int main() {
- int ierr;
- iRel_Instance rel;
- iRel_create(\"\",&rel,&ierr,0);CHK(ierr);
- iRel_destroy(rel,&ierr);CHK(ierr);
- return 0;
-}
-")
-endif ()
-
-set (ITAPS_INCLUDES)
-set (ITAPS_LIBRARIES)
-foreach (component REL GEOM MESH)
- if (ITAPS_${component}_INCLUDES)
- list (APPEND ITAPS_INCLUDES "${ITAPS_${component}_INCLUDES}")
- endif ()
- if (ITAPS_${component}_LIBRARIES)
- list (APPEND ITAPS_LIBRARIES "${ITAPS_${component}_LIBRARIES}")
- endif ()
- message (STATUS "ITAPS_${component}: ${ITAPS_${component}_INCLUDES} ${ITAPS_${component}_LIBRARIES}")
-endforeach()
-list (REMOVE_DUPLICATES ITAPS_INCLUDES)
-list (REMOVE_DUPLICATES ITAPS_LIBRARIES)
-
-set (ITAPS_FOUND_REQUIRED_COMPONENTS YES)
-if (ITAPS_FIND_REQUIRED)
- foreach (component ${ITAPS_FIND_COMPONENTS})
- if (NOT ITAPS_${component}_FOUND)
- set (ITAPS_FOUND_REQUIRED_COMPONENTS NOTFOUND)
- endif()
- endforeach()
-endif()
-
-message (STATUS "ITAPS: ${ITAPS_INCLUDES} ${ITAPS_LIBRARIES}")
-
-find_package_handle_standard_args (ITAPS "ITAPS not found, check environment variables I{MESH,GEOM,REL}_DIR"
- ITAPS_INCLUDES ITAPS_LIBRARIES ITAPS_FOUND_REQUIRED_COMPONENTS)
diff --git a/packages/cmake-modules/FindNetCDF.cmake b/packages/cmake-modules/FindNetCDF.cmake
deleted file mode 100644
index 4db4b0d384c7c2d2bfb57b4847bbb9d5c0650364..0000000000000000000000000000000000000000
--- a/packages/cmake-modules/FindNetCDF.cmake
+++ /dev/null
@@ -1,71 +0,0 @@
-# - Find NetCDF
-# Find the native NetCDF includes and library
-#
-# NETCDF_INCLUDES - where to find netcdf.h, etc
-# NETCDF_LIBRARIES - Link these libraries when using NetCDF
-# NETCDF_FOUND - True if NetCDF found including required interfaces (see below)
-#
-# Your package can require certain interfaces to be FOUND by setting these
-#
-# NETCDF_CXX - require the C++ interface and link the C++ library
-# NETCDF_F77 - require the F77 interface and link the fortran library
-# NETCDF_F90 - require the F90 interface and link the fortran library
-#
-# The following are not for general use and are included in
-# NETCDF_LIBRARIES if the corresponding option above is set.
-#
-# NETCDF_LIBRARIES_C - Just the C interface
-# NETCDF_LIBRARIES_CXX - C++ interface, if available
-# NETCDF_LIBRARIES_F77 - Fortran 77 interface, if available
-# NETCDF_LIBRARIES_F90 - Fortran 90 interface, if available
-#
-# Normal usage would be:
-# set (NETCDF_F90 "YES")
-# find_package (NetCDF REQUIRED)
-# target_link_libraries (uses_f90_interface ${NETCDF_LIBRARIES})
-# target_link_libraries (only_uses_c_interface ${NETCDF_LIBRARIES_C})
-
-if (NETCDF_INCLUDES AND NETCDF_LIBRARIES)
- # Already in cache, be silent
- set (NETCDF_FIND_QUIETLY TRUE)
-endif (NETCDF_INCLUDES AND NETCDF_LIBRARIES)
-
-find_path (NETCDF_INCLUDES netcdf.h
- HINTS NETCDF_DIR ENV NETCDF_DIR)
-
-find_library (NETCDF_LIBRARIES_C NAMES netcdf)
-mark_as_advanced(NETCDF_LIBRARIES_C)
-
-set (NetCDF_has_interfaces "YES") # will be set to NO if we're missing any interfaces
-set (NetCDF_libs "${NETCDF_LIBRARIES_C}")
-
-get_filename_component (NetCDF_lib_dirs "${NETCDF_LIBRARIES_C}" PATH)
-
-macro (NetCDF_check_interface lang header libs)
- if (NETCDF_${lang})
- find_path (NETCDF_INCLUDES_${lang} NAMES ${header}
- HINTS "${NETCDF_INCLUDES}" NO_DEFAULT_PATH)
- find_library (NETCDF_LIBRARIES_${lang} NAMES ${libs}
- HINTS "${NetCDF_lib_dirs}" NO_DEFAULT_PATH)
- mark_as_advanced (NETCDF_INCLUDES_${lang} NETCDF_LIBRARIES_${lang})
- if (NETCDF_INCLUDES_${lang} AND NETCDF_LIBRARIES_${lang})
- list (INSERT NetCDF_libs 0 ${NETCDF_LIBRARIES_${lang}}) # prepend so that -lnetcdf is last
- else (NETCDF_INCLUDES_${lang} AND NETCDF_LIBRARIES_${lang})
- set (NetCDF_has_interfaces "NO")
- message (STATUS "Failed to find NetCDF interface for ${lang}")
- endif (NETCDF_INCLUDES_${lang} AND NETCDF_LIBRARIES_${lang})
- endif (NETCDF_${lang})
-endmacro (NetCDF_check_interface)
-
-NetCDF_check_interface (CXX netcdfcpp.h netcdf_c++)
-NetCDF_check_interface (F77 netcdf.inc netcdff)
-NetCDF_check_interface (F90 netcdf.mod netcdff)
-
-set (NETCDF_LIBRARIES "${NetCDF_libs}" CACHE STRING "All NetCDF libraries required for interface level")
-
-# handle the QUIETLY and REQUIRED arguments and set NETCDF_FOUND to TRUE if
-# all listed variables are TRUE
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (NetCDF DEFAULT_MSG NETCDF_LIBRARIES NETCDF_INCLUDES NetCDF_has_interfaces)
-
-mark_as_advanced (NETCDF_LIBRARIES NETCDF_INCLUDES)
diff --git a/packages/cmake-modules/FindPETSc.cmake b/packages/cmake-modules/FindPETSc.cmake
deleted file mode 100644
index b6aa2ee422d644e668cfd9e7a98e790c4498e2d5..0000000000000000000000000000000000000000
--- a/packages/cmake-modules/FindPETSc.cmake
+++ /dev/null
@@ -1,353 +0,0 @@
-# - Try to find PETSc
-# Once done this will define
-#
-# PETSC_FOUND - system has PETSc
-# PETSC_INCLUDES - the PETSc include directories
-# PETSC_LIBRARIES - Link these to use PETSc
-# PETSC_COMPILER - Compiler used by PETSc, helpful to find a compatible MPI
-# PETSC_DEFINITIONS - Compiler switches for using PETSc
-# PETSC_MPIEXEC - Executable for running MPI programs
-# PETSC_VERSION - Version string (MAJOR.MINOR.SUBMINOR)
-#
-# Usage:
-# find_package(PETSc COMPONENTS CXX) - required if build --with-clanguage=C++ --with-c-support=0
-# find_package(PETSc COMPONENTS C) - standard behavior of checking build using a C compiler
-# find_package(PETSc) - same as above
-#
-# Setting these changes the behavior of the search
-# PETSC_DIR - directory in which PETSc resides
-# PETSC_ARCH - build architecture
-#
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-#
-
-cmake_policy(VERSION 3.3)
-
-set(PETSC_VALID_COMPONENTS
- C
- CXX)
-
-if(NOT PETSc_FIND_COMPONENTS)
- get_property (_enabled_langs GLOBAL PROPERTY ENABLED_LANGUAGES)
- if ("C" IN_LIST _enabled_langs)
- set(PETSC_LANGUAGE_BINDINGS "C")
- else ()
- set(PETSC_LANGUAGE_BINDINGS "CXX")
- endif ()
-else()
- # Right now, this is designed for compatability with the --with-clanguage option, so
- # only allow one item in the components list.
- list(LENGTH ${PETSc_FIND_COMPONENTS} components_length)
- if(${components_length} GREATER 1)
- message(FATAL_ERROR "Only one component for PETSc is allowed to be specified")
- endif()
- # This is a stub for allowing multiple components should that time ever come. Perhaps
- # to also test Fortran bindings?
- foreach(component ${PETSc_FIND_COMPONENTS})
- list(FIND PETSC_VALID_COMPONENTS ${component} component_location)
- if(${component_location} EQUAL -1)
- message(FATAL_ERROR "\"${component}\" is not a valid PETSc component.")
- else()
- list(APPEND PETSC_LANGUAGE_BINDINGS ${component})
- endif()
- endforeach()
-endif()
-
-function (petsc_get_version)
- if (EXISTS "${PETSC_DIR}/include/petscversion.h")
- file (STRINGS "${PETSC_DIR}/include/petscversion.h" vstrings REGEX "#define PETSC_VERSION_(RELEASE|MAJOR|MINOR|SUBMINOR|PATCH) ")
- foreach (line ${vstrings})
- string (REGEX REPLACE " +" ";" fields ${line}) # break line into three fields (the first is always "#define")
- list (GET fields 1 var)
- list (GET fields 2 val)
- set (${var} ${val} PARENT_SCOPE)
- set (${var} ${val}) # Also in local scope so we have access below
- endforeach ()
- if (PETSC_VERSION_RELEASE)
- if ($(PETSC_VERSION_PATCH) GREATER 0)
- set (PETSC_VERSION "${PETSC_VERSION_MAJOR}.${PETSC_VERSION_MINOR}.${PETSC_VERSION_SUBMINOR}p${PETSC_VERSION_PATCH}" CACHE INTERNAL "PETSc version")
- else ()
- set (PETSC_VERSION "${PETSC_VERSION_MAJOR}.${PETSC_VERSION_MINOR}.${PETSC_VERSION_SUBMINOR}" CACHE INTERNAL "PETSc version")
- endif ()
- else ()
- # make dev version compare higher than any patch level of a released version
- set (PETSC_VERSION "${PETSC_VERSION_MAJOR}.${PETSC_VERSION_MINOR}.${PETSC_VERSION_SUBMINOR}.99" CACHE INTERNAL "PETSc version")
- endif ()
- else ()
- message (SEND_ERROR "PETSC_DIR can not be used, ${PETSC_DIR}/include/petscversion.h does not exist")
- endif ()
-endfunction ()
-
-# Debian uses versioned paths e.g /usr/lib/petscdir/3.5/
-file (GLOB DEB_PATHS "/usr/lib/petscdir/*")
-
-find_path (PETSC_DIR include/petsc.h
- HINTS ENV PETSC_DIR
- PATHS
- /usr/lib/petsc
- # Debian paths
- ${DEB_PATHS}
- # Arch Linux path
- /opt/petsc/linux-c-opt
- # MacPorts path
- /opt/local/lib/petsc
- $ENV{HOME}/petsc
- DOC "PETSc Directory")
-
-find_program (MAKE_EXECUTABLE NAMES make gmake)
-
-if (PETSC_DIR AND NOT PETSC_ARCH)
- set (_petsc_arches
- $ENV{PETSC_ARCH} # If set, use environment variable first
- linux-gnu-c-debug linux-gnu-c-opt # Debian defaults
- x86_64-unknown-linux-gnu i386-unknown-linux-gnu)
- set (petscconf "NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
- foreach (arch ${_petsc_arches})
- if (NOT PETSC_ARCH)
- find_path (petscconf petscconf.h
- HINTS ${PETSC_DIR}
- PATH_SUFFIXES ${arch}/include bmake/${arch}
- NO_DEFAULT_PATH)
- if (petscconf)
- set (PETSC_ARCH "${arch}" CACHE STRING "PETSc build architecture")
- endif (petscconf)
- endif (NOT PETSC_ARCH)
- endforeach (arch)
- set (petscconf "NOTFOUND" CACHE INTERNAL "Scratch variable" FORCE)
-endif (PETSC_DIR AND NOT PETSC_ARCH)
-
-set (petsc_slaves LIBRARIES_SYS LIBRARIES_VEC LIBRARIES_MAT LIBRARIES_DM LIBRARIES_KSP LIBRARIES_SNES LIBRARIES_TS
- INCLUDE_DIR INCLUDE_CONF)
-include (FindPackageMultipass)
-find_package_multipass (PETSc petsc_config_current
- STATES DIR ARCH
- DEPENDENTS INCLUDES LIBRARIES COMPILER MPIEXEC ${petsc_slaves})
-
-# Determine whether the PETSc layout is old-style (through 2.3.3) or
-# new-style (>= 3.0.0)
-if (EXISTS "${PETSC_DIR}/${PETSC_ARCH}/lib/petsc/conf/petscvariables") # > 3.5
- set (petsc_conf_rules "${PETSC_DIR}/lib/petsc/conf/rules")
- set (petsc_conf_variables "${PETSC_DIR}/lib/petsc/conf/variables")
-elseif (EXISTS "${PETSC_DIR}/${PETSC_ARCH}/include/petscconf.h") # > 2.3.3
- set (petsc_conf_rules "${PETSC_DIR}/conf/rules")
- set (petsc_conf_variables "${PETSC_DIR}/conf/variables")
-elseif (EXISTS "${PETSC_DIR}/bmake/${PETSC_ARCH}/petscconf.h") # <= 2.3.3
- set (petsc_conf_rules "${PETSC_DIR}/bmake/common/rules")
- set (petsc_conf_variables "${PETSC_DIR}/bmake/common/variables")
-elseif (PETSC_DIR)
- message (SEND_ERROR "The pair PETSC_DIR=${PETSC_DIR} PETSC_ARCH=${PETSC_ARCH} do not specify a valid PETSc installation")
-endif ()
-
-if (petsc_conf_rules AND petsc_conf_variables AND NOT petsc_config_current)
- petsc_get_version()
-
- # Put variables into environment since they are needed to get
- # configuration (petscvariables) in the PETSc makefile
- set (ENV{PETSC_DIR} "${PETSC_DIR}")
- set (ENV{PETSC_ARCH} "${PETSC_ARCH}")
-
- # A temporary makefile to probe the PETSc configuration
- set (petsc_config_makefile "${PROJECT_BINARY_DIR}/Makefile.petsc")
- file (WRITE "${petsc_config_makefile}"
-"## This file was autogenerated by FindPETSc.cmake
-# PETSC_DIR = ${PETSC_DIR}
-# PETSC_ARCH = ${PETSC_ARCH}
-include ${petsc_conf_rules}
-include ${petsc_conf_variables}
-show :
-\t-@echo -n \${\${VARIABLE}}
-")
-
- macro (PETSC_GET_VARIABLE name var)
- set (${var} "NOTFOUND" CACHE INTERNAL "Cleared" FORCE)
- execute_process (COMMAND ${MAKE_EXECUTABLE} --no-print-directory -f ${petsc_config_makefile} show VARIABLE=${name}
- OUTPUT_VARIABLE ${var}
- RESULT_VARIABLE petsc_return)
- endmacro (PETSC_GET_VARIABLE)
- petsc_get_variable (PETSC_LIB_DIR petsc_lib_dir)
- petsc_get_variable (PETSC_EXTERNAL_LIB_BASIC petsc_libs_external)
- petsc_get_variable (PETSC_CCPPFLAGS petsc_cpp_line)
- petsc_get_variable (PETSC_INCLUDE petsc_include)
- petsc_get_variable (PCC petsc_cc)
- petsc_get_variable (PCC_FLAGS petsc_cc_flags)
- petsc_get_variable (MPIEXEC petsc_mpiexec)
- # We are done with the temporary Makefile, calling PETSC_GET_VARIABLE after this point is invalid!
- file (REMOVE ${petsc_config_makefile})
-
- include (ResolveCompilerPaths)
- # Extract include paths and libraries from compile command line
- resolve_includes (petsc_includes_all "${petsc_cpp_line}")
-
- #on windows we need to make sure we're linking against the right
- #runtime library
- if (WIN32)
- if (petsc_cc_flags MATCHES "-MT")
- set(using_md False)
- foreach(flag_var
- CMAKE_C_FLAGS CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_RELEASE
- CMAKE_C_FLAGS_MINSIZEREL CMAKE_C_FLAGS_RELWITHDEBINFO
- CMAKE_CXX_FLAGS CMAKE_CXX_FLAGS_DEBUG CMAKE_CXX_FLAGS_RELEASE
- CMAKE_CXX_FLAGS_MINSIZEREL CMAKE_CXX_FLAGS_RELWITHDEBINFO)
- if(${flag_var} MATCHES "/MD")
- set(using_md True)
- endif(${flag_var} MATCHES "/MD")
- endforeach(flag_var)
- if(${using_md} MATCHES "True")
- message(WARNING "PETSc was built with /MT, but /MD is currently set.
- See http://www.cmake.org/Wiki/CMake_FAQ#How_can_I_build_my_MSVC_application_with_a_static_runtime.3F")
- endif(${using_md} MATCHES "True")
- endif (petsc_cc_flags MATCHES "-MT")
- endif (WIN32)
-
- include (CorrectWindowsPaths)
- convert_cygwin_path(petsc_lib_dir)
- message (STATUS "petsc_lib_dir ${petsc_lib_dir}")
-
- macro (PETSC_FIND_LIBRARY suffix name)
- set (PETSC_LIBRARY_${suffix} "NOTFOUND" CACHE INTERNAL "Cleared" FORCE) # Clear any stale value, if we got here, we need to find it again
- if (WIN32)
- set (libname lib${name}) #windows expects "libfoo", linux expects "foo"
- else (WIN32)
- set (libname ${name})
- endif (WIN32)
- find_library (PETSC_LIBRARY_${suffix} NAMES ${libname} HINTS ${petsc_lib_dir} NO_DEFAULT_PATH)
- set (PETSC_LIBRARIES_${suffix} "${PETSC_LIBRARY_${suffix}}")
- mark_as_advanced (PETSC_LIBRARY_${suffix})
- endmacro (PETSC_FIND_LIBRARY suffix name)
-
- # Look for petscvec first, if it doesn't exist, we must be using single-library
- petsc_find_library (VEC petscvec)
- if (PETSC_LIBRARY_VEC)
- petsc_find_library (SYS "petscsys;petsc") # libpetscsys is called libpetsc prior to 3.1 (when single-library was introduced)
- petsc_find_library (MAT petscmat)
- petsc_find_library (DM petscdm)
- petsc_find_library (KSP petscksp)
- petsc_find_library (SNES petscsnes)
- petsc_find_library (TS petscts)
- macro (PETSC_JOIN libs deps)
- list (APPEND PETSC_LIBRARIES_${libs} ${PETSC_LIBRARIES_${deps}})
- endmacro (PETSC_JOIN libs deps)
- petsc_join (VEC SYS)
- petsc_join (MAT VEC)
- petsc_join (DM MAT)
- petsc_join (KSP DM)
- petsc_join (SNES KSP)
- petsc_join (TS SNES)
- petsc_join (ALL TS)
- else ()
- set (PETSC_LIBRARY_VEC "NOTFOUND" CACHE INTERNAL "Cleared" FORCE) # There is no libpetscvec
- petsc_find_library (SINGLE petsc)
- # Debian 9/Ubuntu 16.04 uses _real and _complex extensions when using libraries in /usr/lib/petsc.
- if (NOT PETSC_LIBRARY_SINGLE)
- petsc_find_library (SINGLE petsc_real)
- endif()
- if (NOT PETSC_LIBRARY_SINGLE)
- petsc_find_library (SINGLE petsc_complex)
- endif()
- foreach (pkg SYS VEC MAT DM KSP SNES TS ALL)
- set (PETSC_LIBRARIES_${pkg} "${PETSC_LIBRARY_SINGLE}")
- endforeach ()
- endif ()
- if (PETSC_LIBRARY_TS)
- message (STATUS "Recognized PETSc install with separate libraries for each package")
- else ()
- message (STATUS "Recognized PETSc install with single library for all packages")
- endif ()
-
- include(Check${PETSC_LANGUAGE_BINDINGS}SourceRuns)
- macro (PETSC_TEST_RUNS includes libraries runs)
- if (PETSC_VERSION VERSION_GREATER 3.1)
- set (_PETSC_TSDestroy "TSDestroy(&ts)")
- else ()
- set (_PETSC_TSDestroy "TSDestroy(ts)")
- endif ()
-
- set(_PETSC_TEST_SOURCE "
-static const char help[] = \"PETSc test program.\";
-#include <petscts.h>
-int main(int argc,char *argv[]) {
- PetscErrorCode ierr;
- TS ts;
-
- ierr = PetscInitialize(&argc,&argv,0,help);CHKERRQ(ierr);
- ierr = TSCreate(PETSC_COMM_WORLD,&ts);CHKERRQ(ierr);
- ierr = TSSetFromOptions(ts);CHKERRQ(ierr);
- ierr = ${_PETSC_TSDestroy};CHKERRQ(ierr);
- ierr = PetscFinalize();CHKERRQ(ierr);
- return 0;
-}
-")
- multipass_source_runs(
- "${includes} ${MPI_CXX_INCLUDE_DIRS} ${MPI_CXX_COMPILER_INCLUDE_DIRS}"
- "${libraries}"
- "${_PETSC_TEST_SOURCE}"
- ${runs}
- "${PETSC_LANGUAGE_BINDINGS}"
- )
-
- if (${${runs}})
- set (PETSC_EXECUTABLE_RUNS "YES" CACHE BOOL
- "Can the system successfully run a PETSc executable? This variable can be manually set to \"YES\" to force CMake to accept a given PETSc configuration, but this will almost always result in a broken build. If you change PETSC_DIR, PETSC_ARCH, or PETSC_CURRENT you would have to reset this variable." FORCE)
- endif (${${runs}})
- endmacro (PETSC_TEST_RUNS)
-
-
- find_path (PETSC_INCLUDE_DIR petscts.h HINTS "${PETSC_DIR}" PATH_SUFFIXES include NO_DEFAULT_PATH)
- find_path (PETSC_INCLUDE_CONF petscconf.h HINTS "${PETSC_DIR}" PATH_SUFFIXES "${PETSC_ARCH}/include" "bmake/${PETSC_ARCH}" NO_DEFAULT_PATH)
- mark_as_advanced (PETSC_INCLUDE_DIR PETSC_INCLUDE_CONF)
- set (petsc_includes_minimal ${PETSC_INCLUDE_CONF} ${PETSC_INCLUDE_DIR})
-
- petsc_test_runs ("${petsc_includes_minimal}" "${PETSC_LIBRARIES_TS}" petsc_works_minimal)
- if (petsc_works_minimal)
- message (STATUS "Minimal PETSc includes and libraries work. This probably means we are building with shared libs.")
- set (petsc_includes_needed "${petsc_includes_minimal}")
- else (petsc_works_minimal) # Minimal includes fail, see if just adding full includes fixes it
- petsc_test_runs ("${petsc_includes_all}" "${PETSC_LIBRARIES_TS}" petsc_works_allincludes)
- if (petsc_works_allincludes) # It does, we just need all the includes (
- message (STATUS "PETSc requires extra include paths, but links correctly with only interface libraries. This is an unexpected configuration (but it seems to work fine).")
- set (petsc_includes_needed ${petsc_includes_all})
- else (petsc_works_allincludes) # We are going to need to link the external libs explicitly
- resolve_libraries (petsc_libraries_external "${petsc_libs_external}")
- foreach (pkg SYS VEC MAT DM KSP SNES TS ALL)
- list (APPEND PETSC_LIBRARIES_${pkg} ${petsc_libraries_external})
- endforeach (pkg)
- petsc_test_runs ("${petsc_includes_minimal}" "${PETSC_LIBRARIES_TS}" petsc_works_alllibraries)
- if (petsc_works_alllibraries)
- message (STATUS "PETSc only need minimal includes, but requires explicit linking to all dependencies. This is expected when PETSc is built with static libraries.")
- set (petsc_includes_needed ${petsc_includes_minimal})
- else (petsc_works_alllibraries)
- # It looks like we really need everything, should have listened to Matt
- set (petsc_includes_needed ${petsc_includes_all})
- petsc_test_runs ("${petsc_includes_all}" "${PETSC_LIBRARIES_TS}" petsc_works_all)
- if (petsc_works_all) # We fail anyways
- message (STATUS "PETSc requires extra include paths and explicit linking to all dependencies. This probably means you have static libraries and something unexpected in PETSc headers.")
- else (petsc_works_all) # We fail anyways
- message (STATUS "PETSc could not be used, maybe the install is broken.")
- endif (petsc_works_all)
- endif (petsc_works_alllibraries)
- endif (petsc_works_allincludes)
- endif (petsc_works_minimal)
-
- # We do an out-of-source build so __FILE__ will be an absolute path, hence __INSDIR__ is superfluous
- if (${PETSC_VERSION} VERSION_LESS 3.1)
- set (PETSC_DEFINITIONS "-D__SDIR__=\"\"" CACHE STRING "PETSc definitions" FORCE)
- else ()
- set (PETSC_DEFINITIONS "-D__INSDIR__=" CACHE STRING "PETSc definitions" FORCE)
- endif ()
- # Sometimes this can be used to assist FindMPI.cmake
- set (PETSC_MPIEXEC ${petsc_mpiexec} CACHE FILEPATH "Executable for running PETSc MPI programs" FORCE)
- set (PETSC_INCLUDES ${petsc_includes_needed} CACHE STRING "PETSc include path" FORCE)
- set (PETSC_LIBRARIES ${PETSC_LIBRARIES_ALL} CACHE STRING "PETSc libraries" FORCE)
- set (PETSC_COMPILER ${petsc_cc} CACHE FILEPATH "PETSc compiler" FORCE)
- # Note that we have forced values for all these choices. If you
- # change these, you are telling the system to trust you that they
- # work. It is likely that you will end up with a broken build.
- mark_as_advanced (PETSC_INCLUDES PETSC_LIBRARIES PETSC_COMPILER PETSC_DEFINITIONS PETSC_MPIEXEC PETSC_EXECUTABLE_RUNS)
-endif ()
-
-include (FindPackageHandleStandardArgs)
-find_package_handle_standard_args (PETSc
- REQUIRED_VARS PETSC_INCLUDES PETSC_LIBRARIES PETSC_EXECUTABLE_RUNS
- VERSION_VAR PETSC_VERSION
- FAIL_MESSAGE "PETSc could not be found. Be sure to set PETSC_DIR and PETSC_ARCH.")
diff --git a/packages/cmake-modules/FindPackageMultipass.cmake b/packages/cmake-modules/FindPackageMultipass.cmake
deleted file mode 100644
index fbf06a7f0fc3aa20a0387f091eac4f74e7ffdab2..0000000000000000000000000000000000000000
--- a/packages/cmake-modules/FindPackageMultipass.cmake
+++ /dev/null
@@ -1,106 +0,0 @@
-# PackageMultipass - this module defines two macros
-#
-# FIND_PACKAGE_MULTIPASS (Name CURRENT
-# STATES VAR0 VAR1 ...
-# DEPENDENTS DEP0 DEP1 ...)
-#
-# This function creates a cache entry <UPPERCASED-Name>_CURRENT which
-# the user can set to "NO" to trigger a reconfiguration of the package.
-# The first time this function is called, the values of
-# <UPPERCASED-Name>_VAR0, ... are saved. If <UPPERCASED-Name>_CURRENT
-# is false or if any STATE has changed since the last time
-# FIND_PACKAGE_MULTIPASS() was called, then CURRENT will be set to "NO",
-# otherwise CURRENT will be "YES". IF not CURRENT, then
-# <UPPERCASED-Name>_DEP0, ... will be FORCED to NOTFOUND.
-# Example:
-# find_path (FOO_DIR include/foo.h)
-# FIND_PACKAGE_MULTIPASS (Foo foo_current
-# STATES DIR
-# DEPENDENTS INCLUDES LIBRARIES)
-# if (NOT foo_current)
-# # Make temporary files, run programs, etc, to determine FOO_INCLUDES and FOO_LIBRARIES
-# endif (NOT foo_current)
-#
-# MULTIPASS_SOURCE_RUNS (Name INCLUDES LIBRARIES SOURCE RUNS LANGUAGE)
-# Always runs the given test, use this when you need to re-run tests
-# because parent variables have made old cache entries stale. The LANGUAGE
-# variable is either C or CXX indicating which compiler the test should
-# use.
-# MULTIPASS_C_SOURCE_RUNS (Name INCLUDES LIBRARIES SOURCE RUNS)
-# DEPRECATED! This is only included for backwards compatability. Use
-# the more general MULTIPASS_SOURCE_RUNS instead.
-# Always runs the given test, use this when you need to re-run tests
-# because parent variables have made old cache entries stale.
-
-macro (FIND_PACKAGE_MULTIPASS _name _current)
- string (TOUPPER ${_name} _NAME)
- set (_args ${ARGV})
- list (REMOVE_AT _args 0 1)
-
- set (_states_current "YES")
- list (GET _args 0 _cmd)
- if (_cmd STREQUAL "STATES")
- list (REMOVE_AT _args 0)
- list (GET _args 0 _state)
- while (_state AND NOT _state STREQUAL "DEPENDENTS")
- # The name of the stored value for the given state
- set (_stored_var PACKAGE_MULTIPASS_${_NAME}_${_state})
- if (NOT "${${_stored_var}}" STREQUAL "${${_NAME}_${_state}}")
- set (_states_current "NO")
- endif (NOT "${${_stored_var}}" STREQUAL "${${_NAME}_${_state}}")
- set (${_stored_var} "${${_NAME}_${_state}}" CACHE INTERNAL "Stored state for ${_name}." FORCE)
- list (REMOVE_AT _args 0)
- list (GET _args 0 _state)
- endwhile (_state AND NOT _state STREQUAL "DEPENDENTS")
- endif (_cmd STREQUAL "STATES")
-
- set (_stored ${_NAME}_CURRENT)
- if (NOT ${_stored})
- set (${_stored} "YES" CACHE BOOL "Is the configuration for ${_name} current? Set to \"NO\" to reconfigure." FORCE)
- set (_states_current "NO")
- endif (NOT ${_stored})
-
- set (${_current} ${_states_current})
- if (NOT ${_current} AND PACKAGE_MULTIPASS_${_name}_CALLED)
- message (STATUS "Clearing ${_name} dependent variables")
- # Clear all the dependent variables so that the module can reset them
- list (GET _args 0 _cmd)
- if (_cmd STREQUAL "DEPENDENTS")
- list (REMOVE_AT _args 0)
- foreach (dep ${_args})
- set (${_NAME}_${dep} "NOTFOUND" CACHE INTERNAL "Cleared" FORCE)
- endforeach (dep)
- endif (_cmd STREQUAL "DEPENDENTS")
- set (${_NAME}_FOUND "NOTFOUND" CACHE INTERNAL "Cleared" FORCE)
- endif ()
- set (PACKAGE_MULTIPASS_${name}_CALLED YES CACHE INTERNAL "Private" FORCE)
-endmacro (FIND_PACKAGE_MULTIPASS)
-
-
-macro (MULTIPASS_SOURCE_RUNS includes libraries source runs language)
- include (Check${language}SourceRuns)
- # This is a ridiculous hack. CHECK_${language}_SOURCE_* thinks that if the
- # *name* of the return variable doesn't change, then the test does
- # not need to be re-run. We keep an internal count which we
- # increment to guarantee that every test name is unique. If we've
- # gotten here, then the configuration has changed enough that the
- # test *needs* to be rerun.
- if (NOT MULTIPASS_TEST_COUNT)
- set (MULTIPASS_TEST_COUNT 00)
- endif (NOT MULTIPASS_TEST_COUNT)
- math (EXPR _tmp "${MULTIPASS_TEST_COUNT} + 1") # Why can't I add to a cache variable?
- set (MULTIPASS_TEST_COUNT ${_tmp} CACHE INTERNAL "Unique test ID")
- set (testname MULTIPASS_TEST_${MULTIPASS_TEST_COUNT}_${runs})
- set (CMAKE_REQUIRED_INCLUDES ${includes})
- set (CMAKE_REQUIRED_LIBRARIES ${libraries})
- if(${language} STREQUAL "C")
- check_c_source_runs ("${source}" ${testname})
- elseif(${language} STREQUAL "CXX")
- check_cxx_source_runs ("${source}" ${testname})
- endif()
- set (${runs} "${${testname}}")
-endmacro (MULTIPASS_SOURCE_RUNS)
-
-macro (MULTIPASS_C_SOURCE_RUNS includes libraries source runs)
- multipass_source_runs("${includes}" "${libraries}" "${source}" ${runs} "C")
-endmacro (MULTIPASS_C_SOURCE_RUNS)
diff --git a/packages/cmake-modules/LICENSE b/packages/cmake-modules/LICENSE
deleted file mode 100644
index 49bac9892af49f867817ca73496499cd6a6fbf89..0000000000000000000000000000000000000000
--- a/packages/cmake-modules/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright $(git shortlog -s)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this
- list of conditions and the following disclaimer in the documentation and/or
- other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/packages/cmake-modules/README b/packages/cmake-modules/README
deleted file mode 100644
index 6f2183ca12ec2ea808f9f69b53e1f1b0a9bd1c97..0000000000000000000000000000000000000000
--- a/packages/cmake-modules/README
+++ /dev/null
@@ -1,7 +0,0 @@
-A collection of CMake modules, these can mostly be used independently.
-
-The utilities for writing robust Find* modules might be useful until
-CMake takes static libraries and multiple active configurations
-seriously.
-
- http://www.cmake.org/Wiki/CMake:Improving_Find*_Modules
diff --git a/packages/cmake-modules/ResolveCompilerPaths.cmake b/packages/cmake-modules/ResolveCompilerPaths.cmake
deleted file mode 100644
index 54787fa38ffa50136414e6c788c50fb3c63746b8..0000000000000000000000000000000000000000
--- a/packages/cmake-modules/ResolveCompilerPaths.cmake
+++ /dev/null
@@ -1,105 +0,0 @@
-# ResolveCompilerPaths - this module defines two macros
-#
-# RESOLVE_LIBRARIES (XXX_LIBRARIES LINK_LINE)
-# This macro is intended to be used by FindXXX.cmake modules.
-# It parses a compiler link line and resolves all libraries
-# (-lfoo) using the library path contexts (-L/path) in scope.
-# The result in XXX_LIBRARIES is the list of fully resolved libs.
-# Example:
-#
-# RESOLVE_LIBRARIES (FOO_LIBRARIES "-L/A -la -L/B -lb -lc -ld")
-#
-# will be resolved to
-#
-# FOO_LIBRARIES:STRING="/A/liba.so;/B/libb.so;/A/libc.so;/usr/lib/libd.so"
-#
-# if the filesystem looks like
-#
-# /A: liba.so libc.so
-# /B: liba.so libb.so
-# /usr/lib: liba.so libb.so libc.so libd.so
-#
-# and /usr/lib is a system directory.
-#
-# Note: If RESOLVE_LIBRARIES() resolves a link line differently from
-# the native linker, there is a bug in this macro (please report it).
-#
-# RESOLVE_INCLUDES (XXX_INCLUDES INCLUDE_LINE)
-# This macro is intended to be used by FindXXX.cmake modules.
-# It parses a compile line and resolves all includes
-# (-I/path/to/include) to a list of directories. Other flags are ignored.
-# Example:
-#
-# RESOLVE_INCLUDES (FOO_INCLUDES "-I/A -DBAR='\"irrelevant -I/string here\"' -I/B")
-#
-# will be resolved to
-#
-# FOO_INCLUDES:STRING="/A;/B"
-#
-# assuming both directories exist.
-# Note: as currently implemented, the -I/string will be picked up mistakenly (cry, cry)
-include (CorrectWindowsPaths)
-
-macro (RESOLVE_LIBRARIES LIBS LINK_LINE)
- string (REGEX MATCHALL "((-L|-l|-Wl)([^\" ]+|\"[^\"]+\")|[^\" ]+\\.(a|so|dll|lib))" _all_tokens "${LINK_LINE}")
- set (_libs_found "")
- set (_directory_list "")
- foreach (token ${_all_tokens})
- if (token MATCHES "-L([^\" ]+|\"[^\"]+\")")
- # If it's a library path, add it to the list
- string (REGEX REPLACE "^-L" "" token ${token})
- string (REGEX REPLACE "//" "/" token ${token})
- convert_cygwin_path(token)
- list (APPEND _directory_list ${token})
- elseif (token MATCHES "^(-l([^\" ]+|\"[^\"]+\")|[^\" ]+\\.(a|so|dll|lib))")
- # It's a library, resolve the path by looking in the list and then (by default) in system directories
- if (WIN32) #windows expects "libfoo", linux expects "foo"
- string (REGEX REPLACE "^-l" "lib" token ${token})
- else (WIN32)
- string (REGEX REPLACE "^-l" "" token ${token})
- endif (WIN32)
- set (_root "")
- if (token MATCHES "^/") # We have an absolute path
- #separate into a path and a library name:
- string (REGEX MATCH "[^/]*\\.(a|so|dll|lib)$" libname ${token})
- string (REGEX MATCH ".*[^${libname}$]" libpath ${token})
- convert_cygwin_path(libpath)
- set (_directory_list ${_directory_list} ${libpath})
- set (token ${libname})
- endif (token MATCHES "^/")
- set (_lib "NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
- find_library (_lib ${token} HINTS ${_directory_list} ${_root})
- if (_lib)
- string (REPLACE "//" "/" _lib ${_lib})
- list (APPEND _libs_found ${_lib})
- else (_lib)
- message (STATUS "Unable to find library ${token}")
- endif (_lib)
- endif (token MATCHES "-L([^\" ]+|\"[^\"]+\")")
- endforeach (token)
- set (_lib "NOTFOUND" CACHE INTERNAL "Scratch variable" FORCE)
- # only the LAST occurence of each library is required since there should be no circular dependencies
- if (_libs_found)
- list (REVERSE _libs_found)
- list (REMOVE_DUPLICATES _libs_found)
- list (REVERSE _libs_found)
- endif (_libs_found)
- set (${LIBS} "${_libs_found}")
-endmacro (RESOLVE_LIBRARIES)
-
-macro (RESOLVE_INCLUDES INCS COMPILE_LINE)
- string (REGEX MATCHALL "-I([^\" ]+|\"[^\"]+\")" _all_tokens "${COMPILE_LINE}")
- set (_incs_found "")
- foreach (token ${_all_tokens})
- string (REGEX REPLACE "^-I" "" token ${token})
- string (REGEX REPLACE "//" "/" token ${token})
- convert_cygwin_path(token)
- if (EXISTS ${token})
- list (APPEND _incs_found ${token})
- else (EXISTS ${token})
- message (STATUS "Include directory ${token} does not exist")
- endif (EXISTS ${token})
- endforeach (token)
- list (REMOVE_DUPLICATES _incs_found)
- set (${INCS} "${_incs_found}")
-endmacro (RESOLVE_INCLUDES)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4cff6b232c85518a83c3eef3cd4ff9843c54c86a..b4296426782f617a070607c240abb01d28aed54c 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -107,6 +107,8 @@ target_link_libraries (unit_tests
${MPI_CXX_LINK_FLAGS} ${MPI_CXX_LIBRARIES}
${PETSC_LIBRARIES}
Catch2
+ ${PUGS_STD_LINK_FLAGS}
+ stdc++fs
)
target_link_libraries (mpi_unit_tests
@@ -119,6 +121,8 @@ target_link_libraries (mpi_unit_tests
${MPI_CXX_LINK_FLAGS} ${MPI_CXX_LIBRARIES}
${PETSC_LIBRARIES}
Catch2
+ ${PUGS_STD_LINK_FLAGS}
+ stdc++fs
)
enable_testing()