dolfin team mailing list archive

["Garth N. Wells" <gnw20@xxxxxxxxx>]

On Mon, 2010-08-23 at 10:34 +0000, noreply@xxxxxxxxxxxxx wrote:
> ------------------------------------------------------------
> revno: 5057
> committer: Anders Logg <logg@xxxxxxxxx>
> branch nick: dolfin-dev
> timestamp: Mon 2010-08-23 12:31:46 +0200
> message:
>   Collect optional packages in OPTIONAL_PACKAGES and use to set options.

I think that this should changed this back. It's nice to be able to
enable/disable packages from the GUI, and it's nice to have a
descriptive string.

Garth

> modified:
>   CMakeLists.txt
> 
> 
> --
> 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
> differences between files attachment (revision-diff.txt)
> === modified file 'CMakeLists.txt'
> --- CMakeLists.txt	2010-08-23 09:27:40 +0000
> +++ CMakeLists.txt	2010-08-23 10:31:46 +0000
> @@ -53,19 +53,27 @@
>  #            everything and DOLFIN_ENABLE_DEFAULT_PACKAGES for enabling only
>  #            some default packages.
>  
> -option(DOLFIN_ENABLE_MPI "Compile with support for MPI." ON)
> -option(DOLFIN_ENABLE_PETSC "Compile with support for PETSc linear algebra." ON)
> -option(DOLFIN_ENABLE_SLEPC "Compile with support for SLEPc." ON)
> -option(DOLFIN_ENABLE_SCOTCH "Compile with support for SCOTCH graph partitioning." ON)
> -option(DOLFIN_ENABLE_UMFPACK "Compile with support for UMFPACK." ON)
> -option(DOLFIN_ENABLE_TRILINOS "Compile with support for Trilinos." ON)
> -option(DOLFIN_ENABLE_CHOLMOD "Compile with support for CHOLMOD." ON)
> -option(DOLFIN_ENABLE_MTL4 "Compile with support for MTL4." ON)
> -option(DOLFIN_ENABLE_PARMETIS "Compile with support for ParMETIS." ON)
> -option(DOLFIN_ENABLE_GMP "Compile with support for GMP." ON)
> -option(DOLFIN_ENABLE_ZLIB "Compile with support for zlib." ON)
> -option(DOLFIN_ENABLE_CGAL "Compile with support for CGAL" ON)
> -option(DOLFIN_ENABLE_PYTHON "Compile the Python wrappers." ON)
> +# List optional packages
> +set(OPTIONAL_PACKAGES "")
> +list(APPEND OPTIONAL_PACKAGES "MPI")
> +list(APPEND OPTIONAL_PACKAGES "PETSc")
> +list(APPEND OPTIONAL_PACKAGES "SLEPc")
> +list(APPEND OPTIONAL_PACKAGES "Trilinos")
> +list(APPEND OPTIONAL_PACKAGES "MTL4")
> +list(APPEND OPTIONAL_PACKAGES "UMFPACK")
> +list(APPEND OPTIONAL_PACKAGES "CHOLMOD")
> +list(APPEND OPTIONAL_PACKAGES "SCOTCH")
> +list(APPEND OPTIONAL_PACKAGES "ParMETIS")
> +list(APPEND OPTIONAL_PACKAGES "GMP")
> +list(APPEND OPTIONAL_PACKAGES "CGAL")
> +list(APPEND OPTIONAL_PACKAGES "zlib")
> +list(APPEND OPTIONAL_PACKAGES "Python")
> +
> +# Add options
> +foreach (OPTIONAL_PACKAGE ${OPTIONAL_PACKAGES})
> +  string(TOUPPER "DOLFIN_ENABLE_${OPTIONAL_PACKAGE}" OPTION_NAME)
> +  option(${OPTION_NAME} "Compile with support for ${OPTIONAL_PACKAGE}." ON)
> +endforeach()
>  
>  #------------------------------------------------------------------------------
>  # Package-specific options
> @@ -274,7 +282,7 @@
>  if (APPLE)
>    set(OS_LIBRARY_PATH_NAME "DYLD_LIBRARY_PATH")
>    message("(A) LIbs ${OS_LIBRARY_PATH_NAME}")
> -else()  
> +else()
>    set(OS_LIBRARY_PATH_NAME "LD_LIBRARY_PATH")
>    message("(B) LIbs ${OS_LIBRARY_PATH_NAME}")
>  endif()
>