dolfin team mailing list archive

[Johannes Ring <johannr@xxxxxxxxx>]

On Wed, Aug 18, 2010 at 1:32 PM,  <noreply@xxxxxxxxxxxxx> wrote:
> ------------------------------------------------------------
> revno: 5014
> committer: Garth N. Wells <gnw20@xxxxxxxxx>
> branch nick: dolfin-cmake
> timestamp: Wed 2010-08-18 12:30:24 +0100
> message:
>  Install dolfin_utils.
> modified:
>  CMakeLists.txt
>  dolfin/CMakeLists.txt
>  dolfin/swig/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
>
> === modified file 'CMakeLists.txt'
> --- CMakeLists.txt      2010-08-17 14:46:14 +0000
> +++ CMakeLists.txt      2010-08-18 11:30:24 +0000
> @@ -229,6 +229,16 @@
>  add_subdirectory(dolfin)
>
>  #------------------------------------------------------------------------------
> +# Install Python utils (dolfin_utils)
> +
> +install(DIRECTORY
> +  ${CMAKE_SOURCE_DIR}/site-packages/dolfin_utils
> +  DESTINATION ${DOLFIN_INSTALL_PYTHON_MODULE_DIR}
> +  USE_SOURCE_PERMISSIONS
> +  COMPONENT Runtime
> +  )

FWIW, I think that this should be in its own
site-packages/CMakeLists.txt together with the part that now is in
dolfin/swig/CMakeLists.txt for installing site-packages/dolfin.

> +#------------------------------------------------------------------------------
>  # Generate helper file dolfin.conf
>
>  # FIXME: not cross-platform compatible
>
> === modified file 'dolfin/CMakeLists.txt'
> --- dolfin/CMakeLists.txt       2010-08-18 00:42:17 +0000
> +++ dolfin/CMakeLists.txt       2010-08-18 11:30:24 +0000
> @@ -279,16 +279,6 @@
>  # Add definitions to PKG_CXXFLAGS
>  set(PKG_CXXFLAGS "${PKG_DEFINITIONS} ${PKG_CXXFLAGS}")
>
> -# Convert libraries to -L<libdir> -l<lib> form for use in pkg-config file
> -# FIXME: this is not cross-platform ready
> -#foreach(_lib ${DOLFIN_TARGET_LINK_LIBRARIES})
> -#  string(REGEX REPLACE "(/[^ ]*)/lib([^ ]*)\\.so" "-L\\1 -l\\2"
> -#    _linkflags
> -#    "${_lib}"
> -#    )
> -#  set(PKG_LINKFLAGS "${_linkflags} ${PKG_LINKFLAGS}")
> -#endforeach()

Why was this removed?

Johannes

>  # Configure and install pkg-config file
>  configure_file(dolfin.pc.cmake.in dolfin.pc @ONLY)
>  install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dolfin.pc
>
> === modified file 'dolfin/swig/CMakeLists.txt'
> --- dolfin/swig/CMakeLists.txt  2010-08-17 15:13:33 +0000
> +++ dolfin/swig/CMakeLists.txt  2010-08-18 11:30:24 +0000
> @@ -42,6 +42,8 @@
>  swig_link_libraries(cpp dolfin ${PYTHON_LIBRARIES})
>
>  get_target_property(SWIG_MODULE_LOCATION ${SWIG_MODULE_cpp_REAL_NAME} LOCATION)
> +
> +# Install Python .py files
>  install(FILES
>   ${SWIG_MODULE_LOCATION} ${CMAKE_CURRENT_BINARY_DIR}/${SWIG_MODULE_NAME}.py
>   DESTINATION ${DOLFIN_INSTALL_PYTHON_MODULE_DIR}/dolfin
>
>
>