dolfin team mailing list archive

[Johannes Ring <johannr@xxxxxxxxx>]

On Thu, Aug 12, 2010 at 12:46 PM,  <noreply@xxxxxxxxxxxxx> wrote:
> ------------------------------------------------------------
> revno: 4954
> committer: Garth N. Wells <gnw20@xxxxxxxxx>
> branch nick: dolfin-cmake
> timestamp: Thu 2010-08-12 11:45:45 +0100
> message:
>  Compile SWIG files only when required.

Nice!

Johannes

> modified:
>  dolfin/CMakeLists.txt
>  dolfin/swig/CMakeLists.txt
>  dolfin/swig/dolfin.i
>
>
> --
> 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 'dolfin/CMakeLists.txt'
> --- dolfin/CMakeLists.txt       2010-08-11 22:13:42 +0000
> +++ dolfin/CMakeLists.txt       2010-08-12 10:45:45 +0000
> @@ -116,14 +116,14 @@
>  # Add DOFLIN target libraries
>  target_link_libraries(dolfin ${DOLFIN_TARGET_LINK_LIBRARIES})
>
> +add_subdirectory(swig)
> +
>  install(TARGETS dolfin
>   RUNTIME DESTINATION ${DOLFIN_BIN_DIR} COMPONENT RuntimeExecutables
>   LIBRARY DESTINATION ${DOLFIN_LIB_DIR} COMPONENT RuntimeLibraries
>   ARCHIVE DESTINATION ${DOLFIN_LIB_DIR} COMPONENT Development
>   )
>
> -add_subdirectory(swig)
> -
>  #------------------------------------------------------------------------------
>  # Write pkg-config file and install
>
>
> === modified file 'dolfin/swig/CMakeLists.txt'
> --- dolfin/swig/CMakeLists.txt  2010-08-11 22:13:42 +0000
> +++ dolfin/swig/CMakeLists.txt  2010-08-12 10:45:45 +0000
> @@ -37,6 +37,9 @@
>  set(SWIG_SOURCES dolfin.i)
>  set_source_files_properties(${SWIG_SOURCES} PROPERTIES CPLUSPLUS ON)
>
> +# The prevents swig being run unnecessarily
> +set_source_files_properties(dolfin.i PROPERTIES SWIG_MODULE_NAME cpp)
> +
>  include_directories(${PYTHON_INCLUDE_PATH})
>
>  swig_add_module(${SWIG_MODULE_NAME} python ${SWIG_SOURCES})
>
> === modified file 'dolfin/swig/dolfin.i'
> --- dolfin/swig/dolfin.i        2009-12-11 07:05:28 +0000
> +++ dolfin/swig/dolfin.i        2010-08-12 10:45:45 +0000
> @@ -41,7 +41,7 @@
>  // STL SWIG string class
>  %include <std_string.i>
>
> -// Turn on SWIG generated signature documentation and include doxygen
> +// Turn on SWIG generated signature documentation and include doxygen
>  // generated docstrings (Need to run generate.py to update the latter)
>  %feature("autodoc", "1");
>  %include "dolfin/swig/docstrings.i"
>
>
>