I will need to revert this. Apparently, foo (stuff)
is the preferred way, at least according to http://www.cmake.org/cmake/help/examples.html It also looks nicer. -- Anders
--- Begin Message --------------------------------------------------------------- revno: 4997 committer: Anders Logg <[email protected]> branch nick: dolfin-dev timestamp: Tue 2010-08-17 19:32:59 +0200 message: Some formatting and commenting in PETSc config script modified: cmake/FindPETSc.dolfin.cmake -- lp:dolfin https://code.launchpad.net/~dolfin-core/dolfin/main Your team DOLFIN Core Team is subscribed to branch lp:dolfin. To unsubscribe from this branch go to https://code.launchpad.net/~dolfin-core/dolfin/main/+edit-subscription=== modified file 'cmake/FindPETSc.dolfin.cmake' --- cmake/FindPETSc.dolfin.cmake 2010-08-10 16:10:17 +0000 +++ cmake/FindPETSc.dolfin.cmake 2010-08-17 17:32:59 +0000 @@ -18,26 +18,31 @@ # # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -# + +message(STATUS "Checking for package 'PETSc'") + +# Set debian_arches (PETSC_ARCH for Debian-style installations) +foreach(debian_arches linux kfreebsd) + IF ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug") + set(DEBIAN_FLAVORS ${debian_arches}-gnu-c-debug ${debian_arches}-gnu-c-opt ${DEBIAN_FLAVORS}) + ELSE() + set(DEBIAN_FLAVORS ${debian_arches}-gnu-c-opt ${debian_arches}-gnu-c-debug ${DEBIAN_FLAVORS}) + ENDIF() +endforeach() + +# Try to figure out PETSC_DIR 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 $ENV{HOME}/petsc DOC "PETSc Directory") - - -foreach( debian_arches linux kfreebsd ) - IF ( "${CMAKE_BUILD_TYPE}" STREQUAL "Debug" ) - set( DEBIAN_FLAVORS ${debian_arches}-gnu-c-debug ${debian_arches}-gnu-c-opt ${DEBIAN_FLAVORS}) - ELSE() - set( DEBIAN_FLAVORS ${debian_arches}-gnu-c-opt ${debian_arches}-gnu-c-debug ${DEBIAN_FLAVORS}) - ENDIF() -endforeach() - +message(STATUS "PETSC_DIR=${PETSC_DIR}") + +# Try to figure out PETSC_ARCH if (PETSC_DIR AND NOT PETSC_ARCH) set (_petsc_arches - $ENV{PETSC_ARCH} # If set, use environment variable first + $ENV{PETSC_ARCH} # If set, use environment variable first ${DEBIAN_FLAVORS} # Debian defaults x86_64-unknown-linux-gnu i386-unknown-linux-gnu) set (petscconf "NOTFOUND" CACHE FILEPATH "Cleared" FORCE) @@ -54,12 +59,11 @@ endforeach (arch) set (petscconf "NOTFOUND" CACHE INTERNAL "Scratch variable" FORCE) endif (PETSC_DIR AND NOT PETSC_ARCH) - - message (STATUS "PETSc ARCH=${PETSC_ARCH}") - -set (petsc_slaves LIBRARIES_SYS LIBRARIES_VEC LIBRARIES_MAT LIBRARIES_DM LIBRARIES_KSP LIBRARIES_SNES LIBRARIES_TS +message(STATUS "PETSC_ARCH=${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) +include(FindPackageMultipass) find_package_multipass (PETSc petsc_config_current STATES DIR ARCH DEPENDENTS INCLUDES LIBRARIES COMPILER MPIEXEC ${petsc_slaves}) @@ -67,32 +71,32 @@ # 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}/conf/base) ) - set (petsc_conf_base ${PETSC_DIR}/conf/base) + if (EXISTS( ${PETSC_DIR}/conf/base) ) + set(petsc_conf_base ${PETSC_DIR}/conf/base) else() - set (petsc_conf_base ${PETSC_DIR}/conf/rules) - set (petsc_conf_vars ${PETSC_DIR}/conf/variables) + set(petsc_conf_base ${PETSC_DIR}/conf/rules) + set(petsc_conf_vars ${PETSC_DIR}/conf/variables) endif() - set (PETSC_VERSION "3.0.0") -elseif (EXISTS ${PETSC_DIR}/bmake/${PETSC_ARCH}/petscconf.h) # <= 2.3.3 - set (petsc_conf_base ${PETSC_DIR}/bmake/common/base) - set (PETSC_VERSION "2.3.3") -else (EXISTS ${PETSC_DIR}/bmake/${PETSC_ARCH}/petscconf.h) - set (petsc_conf_base "NOTFOUND") -endif (EXISTS ${PETSC_DIR}/${PETSC_ARCH}/include/petscconf.h) + set(PETSC_VERSION "3.0.0") +elseif(EXISTS ${PETSC_DIR}/bmake/${PETSC_ARCH}/petscconf.h) # <= 2.3.3 + set(petsc_conf_base ${PETSC_DIR}/bmake/common/base) + set(PETSC_VERSION "2.3.3") +else(EXISTS ${PETSC_DIR}/bmake/${PETSC_ARCH}/petscconf.h) + set(petsc_conf_base "NOTFOUND") +endif(EXISTS ${PETSC_DIR}/${PETSC_ARCH}/include/petscconf.h) OPTION(PETSC_LIB_BASIC "enable PETSc single library" ON) -if (petsc_conf_base AND NOT petsc_config_current) +if(petsc_conf_base AND NOT petsc_config_current) # 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}) + 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) - if ( DEFINED petsc_conf_vars ) - file (WRITE ${petsc_config_makefile} + set(petsc_config_makefile ${PROJECT_BINARY_DIR}/Makefile.petsc) + if(DEFINED petsc_conf_vars ) + file(WRITE ${petsc_config_makefile} "## This file was autogenerated by FindPETSc.cmake # PETSC_DIR = ${PETSC_DIR} # PETSC_ARCH = ${PETSC_ARCH} @@ -103,7 +107,7 @@ ") else() - file (WRITE ${petsc_config_makefile} + file(WRITE ${petsc_config_makefile} "## This file was autogenerated by FindPETSc.cmake # PETSC_DIR = ${PETSC_DIR} # PETSC_ARCH = ${PETSC_ARCH} @@ -112,54 +116,54 @@ -...@echo -n \${\${VARIABLE}} ") endif() - macro (PETSC_GET_VARIABLE name var) - set (${var} "NOTFOUND" CACHE INTERNAL "Cleared" FORCE) - execute_process (COMMAND ${CMAKE_MAKE_PROGRAM} -f ${petsc_config_makefile} show VARIABLE=${name} + macro(PETSC_GET_VARIABLE name var) + set(${var} "NOTFOUND" CACHE INTERNAL "Cleared" FORCE) + execute_process(COMMAND ${CMAKE_MAKE_PROGRAM} -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(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 (MPIEXEC petsc_mpiexec) # We are done with the temporary Makefile, calling PETSC_GET_VARIABLE after this point is invalid! - file (REMOVE ${petsc_config_makefile}) + file(REMOVE ${petsc_config_makefile}) - include (ResolveCompilerPaths) + include(ResolveCompilerPaths) # Extract include paths and libraries from compile command line - resolve_includes (petsc_includes_all "${petsc_cpp_line}") - - message (STATUS "petsc_lib_dir ${petsc_lib_dir}") - - macro (PETSC_FIND_LIBRARY suffix name) - set (PETSC_LIBRARY_${suffix} "NOTFOUND" CACHE INTERNAL "Cleared" FORCE) - find_library (PETSC_LIBRARY_${suffix} NAMES ${name} HINTS ${petsc_lib_dir}) - set (PETSC_LIBRARIES_${suffix} "${PETSC_LIBRARY_${suffix}}") - mark_as_advanced (PETSC_LIBRARY_${suffix}) + resolve_includes(petsc_includes_all "${petsc_cpp_line}") + + message(STATUS "petsc_lib_dir ${petsc_lib_dir}") + + macro(PETSC_FIND_LIBRARY suffix name) + set(PETSC_LIBRARY_${suffix} "NOTFOUND" CACHE INTERNAL "Cleared" FORCE) + find_library(PETSC_LIBRARY_${suffix} NAMES ${name} HINTS ${petsc_lib_dir}) + set(PETSC_LIBRARIES_${suffix} "${PETSC_LIBRARY_${suffix}}") + mark_as_advanced(PETSC_LIBRARY_${suffix}) endmacro (PETSC_FIND_LIBRARY suffix name) if ( PETSC_LIB_BASIC ) - petsc_find_library (SYS petsc) - petsc_find_library (VEC petsc) - petsc_find_library (MAT petsc) - petsc_find_library (DM petsc) - petsc_find_library (KSP petsc) - petsc_find_library (SNES petsc) - petsc_find_library (TS petsc) + petsc_find_library(SYS petsc) + petsc_find_library(VEC petsc) + petsc_find_library(MAT petsc) + petsc_find_library(DM petsc) + petsc_find_library(KSP petsc) + petsc_find_library(SNES petsc) + petsc_find_library(TS petsc) else () - petsc_find_library (SYS petsc) - petsc_find_library (VEC petscvec) - 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) + petsc_find_library(SYS petsc) + petsc_find_library(VEC petscvec) + 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) endif() - include (CheckCXXSourceRuns) - macro (PETSC_TEST_RUNS includes libraries runs) - multipass_c_source_runs ("${includes}" "${libraries}" " + include(CheckCXXSourceRuns) + macro(PETSC_TEST_RUNS includes libraries runs) + multipass_c_source_runs("${includes}" "${libraries}" " static const char help[] = \"PETSc test program.\"; #include \"petsc.h\" #include \"petscts.h\" @@ -175,83 +179,81 @@ return 0; } " ${runs}) - if (${${runs}}) - set (PETSC_EXECUTABLE_RUNS "YES" CACHE BOOL + 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) - - 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) - - - 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) + endif(${${runs}}) + endmacro(PETSC_TEST_RUNS) + + 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) + + + 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 + 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) + 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 shared 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) + 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 shared 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 __SDIR__ is superfluous - set (PETSC_DEFINITIONS "-D__SDIR__=\"\"" CACHE STRING "PETSc definitions" FORCE) + set(PETSC_DEFINITIONS "-D__SDIR__=\"\"" CACHE STRING "PETSc definitions" FORCE) # 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) + 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 (petsc_conf_base AND NOT petsc_config_current) - - -include (FindPackageHandleStandardArgs) -find_package_handle_standard_args (PETSc + # 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(petsc_conf_base AND NOT petsc_config_current) + +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) PETSC_INCLUDES PETSC_LIBRARIES ) - -if ( PETSC_FOUND ) - #add_definitions( -DHAVE_PETSC -DHAVE_PETSC_H ) - #SET( HAVE_PETSC 1 ) - MARK_AS_ADVANCED( PETSC_CURRENT PETSC_DIR PETSC_ARCH ) -endif( PETSC_FOUND ) +if(PETSC_FOUND) + #add_definitions(-DHAVE_PETSC -DHAVE_PETSC_H) + #SET(HAVE_PETSC 1) + mark_as_advanced(PETSC_CURRENT PETSC_DIR PETSC_ARCH) +endif(PETSC_FOUND)
--- End Message ---
signature.asc
Description: Digital signature
_______________________________________________ Mailing list: https://launchpad.net/~dolfin Post to : [email protected] Unsubscribe : https://launchpad.net/~dolfin More help : https://help.launchpad.net/ListHelp
