Commit 81e08530 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Updated FindPETSC.cmake file and its dependencies 

Taken from https://github.com/jedbrown/cmake-modules
parent f2a9c82c

cmake/CorrectWindowsPaths.cmake

0 → 100644
+14 −0
Original line number Diff line number Diff line 
# 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)

cmake/FindPETSc.cmake

+138 −83
Original line number Diff line number Diff line
@@ -22,12 +22,19 @@ 
# 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.
@@ -58,20 +65,33 @@ file (STRINGS "${PETSC_DIR}/include/petscversion.h" vstrings REGEX "#define PETS 
      set (${var} ${val})         # Also in local scope so we have access below

    endforeach ()

    if (PETSC_VERSION_RELEASE)

      set (PETSC_VERSION "${PETSC_VERSION_MAJOR}.${PETSC_VERSION_MINOR}.${PETSC_VERSION_SUBMINOR}p${PETSC_VERSION_PATCH}" PARENT_SCOPE)

      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" PARENT_SCOPE)

      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/petscdir/3.1 /usr/lib/petscdir/3.0.0 /usr/lib/petscdir/2.3.3 /usr/lib/petscdir/2.3.2 # Debian

  /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")
@@ -106,7 +126,10 @@ find_package_multipass (PETSc petsc_config_current 


# Determine whether the PETSc layout is old-style (through 2.3.3) or

# new-style (>= 3.0.0)

if (EXISTS "${PETSC_DIR}/${PETSC_ARCH}/include/petscconf.h") # > 2.3.3

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
@@ -133,7 +156,7 @@ if (petsc_conf_rules AND petsc_conf_variables AND NOT petsc_config_current) 
include ${petsc_conf_rules}

include ${petsc_conf_variables}

show :

-@echo -n \${\${VARIABLE}}

\t-@echo -n \${\${VARIABLE}}

")



  macro (PETSC_GET_VARIABLE name var)
@@ -147,6 +170,7 @@ show : 
  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})
@@ -155,11 +179,39 @@ show : 
  # 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

    find_library (PETSC_LIBRARY_${suffix} NAMES ${name} HINTS ${petsc_lib_dir} NO_DEFAULT_PATH)

    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)
@@ -186,6 +238,13 @@ show : 
  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 ()
@@ -198,11 +257,6 @@ show : 


  include(Check${PETSC_LANGUAGE_BINDINGS}SourceRuns)

  macro (PETSC_TEST_RUNS includes libraries runs)

    if(${PETSC_LANGUAGE_BINDINGS} STREQUAL "C")

      set(_PETSC_ERR_FUNC "CHKERRQ(ierr)")

    elseif(${PETSC_LANGUAGE_BINDINGS} STREQUAL "CXX")

      set(_PETSC_ERR_FUNC "CHKERRXX(ierr)")

    endif()

    if (PETSC_VERSION VERSION_GREATER 3.1)

      set (_PETSC_TSDestroy "TSDestroy(&ts)")

    else ()
@@ -216,11 +270,11 @@ int main(int argc,char *argv[]) { 
  PetscErrorCode ierr;

  TS ts;



ierr = PetscInitialize(&argc,&argv,0,help);${_PETSC_ERR_FUNC};

ierr = TSCreate(PETSC_COMM_WORLD,&ts);${_PETSC_ERR_FUNC};

ierr = TSSetFromOptions(ts);${_PETSC_ERR_FUNC};

ierr = ${_PETSC_TSDestroy};${_PETSC_ERR_FUNC};

ierr = PetscFinalize();${_PETSC_ERR_FUNC};

  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;

}

")
@@ -287,5 +341,6 @@ endif () 


include (FindPackageHandleStandardArgs)

find_package_handle_standard_args (PETSc

  "PETSc could not be found. Be sure to set PETSC_DIR and PETSC_ARCH."

  PETSC_INCLUDES PETSC_LIBRARIES PETSC_EXECUTABLE_RUNS)
 
 No newline at end of file
 
  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.")

cmake/ResolveCompilerPaths.cmake

+23 −11
Original line number Diff line number Diff line
@@ -38,23 +38,34 @@ 
#

#  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))" _all_tokens "${LINK_LINE}")

  set (_libs_found)

  set (_directory_list)

  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))")

    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})

      set (_root)

      if (token MATCHES "^/")	# We have an absolute path, add root to the search path

	set (_root "/")

      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})
@@ -78,10 +89,11 @@ endmacro (RESOLVE_LIBRARIES) 


macro (RESOLVE_INCLUDES INCS COMPILE_LINE)

  string (REGEX MATCHALL "-I([^\" ]+|\"[^\"]+\")" _all_tokens "${COMPILE_LINE}")

  set (_incs_found)

  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})

cmake/FindPackageMultipass.cmake

+33 −33

File changed.

Contains only whitespace changes.