From 526859bf14c35a89810313d23f479a071ff1ad33 Mon Sep 17 00:00:00 2001 From: Michel Ferrero Date: Fri, 2 Aug 2013 10:13:08 +0200 Subject: [PATCH] Fix a bit the documentation modified: doc/CMakeLists.txt deleted: doc/reference/c++/CMakeLists.txt.v1 deleted: doc/reference/c++/arrays/examples_h5/CMakeLists.txt deleted: doc/reference/c++/arrays_old/CMakeLists.txt.Old deleted: doc/reference/c++/clef/CMakeLists.txt modified: doc/reference/c++/det_manip/CMakeLists.txt modified: doc/reference/c++/gf/CMakeLists.txt modified: doc/reference/c++/parameters/CMakeLists.txt deleted: doc/reference/python/CMakeLists.txt deleted: doc/reference/python/data_analysis/hdf5/CMakeLists.txt --- doc/CMakeLists.txt | 4 +- doc/reference/c++/CMakeLists.txt.v1 | 86 ------------------- .../c++/arrays/examples_h5/CMakeLists.txt | 19 ---- .../c++/arrays_old/CMakeLists.txt.Old | 22 ----- doc/reference/c++/clef/CMakeLists.txt | 1 - doc/reference/c++/det_manip/CMakeLists.txt | 9 -- doc/reference/c++/gf/CMakeLists.txt | 8 -- doc/reference/c++/parameters/CMakeLists.txt | 1 - doc/reference/python/CMakeLists.txt | 45 ---------- .../python/data_analysis/hdf5/CMakeLists.txt | 11 --- 10 files changed, 3 insertions(+), 203 deletions(-) delete mode 100644 doc/reference/c++/CMakeLists.txt.v1 delete mode 100644 doc/reference/c++/arrays/examples_h5/CMakeLists.txt delete mode 100644 doc/reference/c++/arrays_old/CMakeLists.txt.Old delete mode 100644 doc/reference/c++/clef/CMakeLists.txt delete mode 100644 doc/reference/python/CMakeLists.txt delete mode 100644 doc/reference/python/data_analysis/hdf5/CMakeLists.txt diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index a8f54e08..b9aa210b 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -92,7 +92,7 @@ add_dependencies(docs_sphinx docs_doxy) # we must first have doxygen process the add_dependencies(docs_sphinx triqs boost_for_triqs ) # add also mpi ? # Install -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ COMPONENT documentation DESTINATION share/doc/triqs/user_manual +install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ COMPONENT documentation DESTINATION share/doc/triqs FILES_MATCHING PATTERN "*.html" PATTERN "*.png" @@ -110,6 +110,8 @@ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ COMPONENT documentation DEST PATTERN "CVS" EXCLUDE ) +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/themes/agogo DESTINATION share/triqs/themes) + # PDF documentation if (Build_PDF_Documentation) add_dependencies(docs_sphinx_pdf_cpp triqs boost_for_triqs ) # add also mpi ? diff --git a/doc/reference/c++/CMakeLists.txt.v1 b/doc/reference/c++/CMakeLists.txt.v1 deleted file mode 100644 index 4127e91f..00000000 --- a/doc/reference/c++/CMakeLists.txt.v1 +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright Olivier Parcollet 2010 -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -FILE(GLOB_RECURSE SOURCES *.rst) - -# The compiler flags for autocompile -SET( link_libs "${LAPACK_LIBS} ${BOOST_LIBRARY} ${ALPS_EXTRA_LIBRARIES}") -IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - list (REMOVE_DUPLICATES link_libs) -ENDIF( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -string(REPLACE "boost_for_triqs" " " TMP "${link_libs}") -string(REPLACE "debug" " " TMP "${TMP}") -string(REPLACE "optimized" " " TMP "${TMP}") - -if(BOOST_SOURCE_DIR) - SET( link_boost_for_triqs "-lboost_for_triqs") -EXECUTE_PROCESS(COMMAND sh -c "ln -sf ${CMAKE_BINARY_DIR}/foreignlibs/boost/libboost_for_triqs.so ${CMAKE_CURRENT_BINARY_DIR}") -else(BOOST_SOURCE_DIR) - SET( link_boost_for_triqs " ") -endif(BOOST_SOURCE_DIR) -SET(DOC_AUTOCOMPILE_INCLUDE ${BOOST_SOURCE_DIR} ${CMAKE_SOURCE_DIR} ${ALPS_INCLUDE_DIRS} ${ALPS_EXTRA_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/foreignlibs ) -IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -SET(DOC_AUTOCOMPILE_LINK "-L ${CMAKE_BINARY_DIR}/foreignlibs/boost ${link_boost_for_triqs} -L ${CMAKE_BINARY_DIR}/triqs -ltriqs -L ${CMAKE_BINARY_DIR}/triqs -ltriqs_utility ${TMP} ") -SET(DOC_AUTOCOMPILE_DEFINITIONS -std=c++0x -DBOOST_PP_VARIADICS=1 -stdlib=libc++ -I/System/Library/Frameworks/vecLib.framework/Versions/A/Headers) -else() -SET(DOC_AUTOCOMPILE_LINK "-L ${CMAKE_BINARY_DIR}/foreignlibs/boost ${link_boost_for_triqs} -L ${CMAKE_BINARY_DIR}/triqs -ltriqs -L ${CMAKE_BINARY_DIR}/triqs -ltriqs_utility ${TMP} -Wl,-rpath=${CMAKE_CURRENT_BINARY_DIR} ") -SET(DOC_AUTOCOMPILE_DEFINITIONS -std=c++0x -DBOOST_PP_VARIADICS=1 ) -endif() -SET(DOC_AUTOCOMPILE_LD_LIBRARY_PATH " ${CMAKE_BINARY_DIR}/foreignlibs/boost/:${CMAKE_BINARY_DIR}/triqs ") - -EXECUTE_PROCESS(COMMAND sh -c "ln -sf ${CMAKE_BINARY_DIR}/triqs/libtriqs.so ${CMAKE_CURRENT_BINARY_DIR}") -EXECUTE_PROCESS(COMMAND sh -c "ln -sf ${CMAKE_BINARY_DIR}/triqs/libtriqs_utility.so ${CMAKE_CURRENT_BINARY_DIR}") - -# generating the conf.py -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in ${CMAKE_CURRENT_BINARY_DIR}/conf.py) -EXECUTE_PROCESS(COMMAND sh -c "mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/html") -SET(DOC_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}) -SET(DOC_EXT "_cpp") -include(${TRIQS_SOURCE_DIR}/cmake/BuildSphinx.cmake) - -add_all_subdirectories_with_cmakelist() - -# Build the doxygen -SET(DOXYGEN_HTML_OUTPUT ./html/doxy_triqs) -find_package(Doxygen REQUIRED) - -get_property(DOXYGEN_SOURCES GLOBAL PROPERTY DOXYGEN_SOURCES) -string(REPLACE ";" " " DOXYGEN_SOURCES_LIST "${DOXYGEN_SOURCES}") -message(STATUS "Doxygen sources are ${DOXYGEN_SOURCES}") - -# Prepare the Doxyfile -configure_file(${TRIQS_SOURCE_DIR}/cmake/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile) - -SET(doxy_top ${CMAKE_CURRENT_BINARY_DIR}/doxy.log) -add_custom_command (OUTPUT ${doxy_top} DEPENDS ${DOXYGEN_SOURCES} COMMAND ${DOXYGEN_EXECUTABLE} Doxyfile > ${doxy_top} ) -add_custom_target(docs_doxy ALL DEPENDS ${doxy_top}) -add_dependencies(docs_sphinx_cpp docs_doxy) # we must first have doxygen process the sources to link to them -add_dependencies(docs_sphinx_cpp triqs boost_for_triqs ) # add also mpi ? - -if (Build_PDF_Documentation) - # not needed, no link to doxygen in the pdf ... - #add_dependencies(docs_sphinx_pdf_cpp docs_doxy) # we must first have doxygen process the sources to link to them - add_dependencies(docs_sphinx_pdf_cpp triqs boost_for_triqs ) # add also mpi ? - install(FILES ${sphinx_top_pdf} DESTINATION share/doc/triqs/developer_manual/) -endif() - -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ COMPONENT documentation DESTINATION share/doc/triqs/developer_manual - FILES_MATCHING - PATTERN "*.html" - PATTERN "*.png" - PATTERN "*.js" - PATTERN "_*" - PATTERN "*.png" - PATTERN "*.gif" - PATTERN "*.xsl" - PATTERN "*.css" - PATTERN "*.pdf" - PATTERN "*.py" - PATTERN "*.txt" - PATTERN "*.bib" - PATTERN ".svn" EXCLUDE - PATTERN "CVS" EXCLUDE - ) - diff --git a/doc/reference/c++/arrays/examples_h5/CMakeLists.txt b/doc/reference/c++/arrays/examples_h5/CMakeLists.txt deleted file mode 100644 index a5ccd2c1..00000000 --- a/doc/reference/c++/arrays/examples_h5/CMakeLists.txt +++ /dev/null @@ -1,19 +0,0 @@ -FILE(GLOB TestList RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp) -enable_testing() -include_directories( ${CMAKE_CURRENT_BINARY_DIR}) -find_package(TestCSimple) - -SET( link_libs ${LAPACK_LIBS} ${BOOST_LIBRARY} ${ALPS_EXTRA_LIBRARIES}) -IF(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - list (REMOVE_DUPLICATES link_libs) -ENDIF( ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - -link_libraries( ${link_libs} triqs ) # adding triqs for the stack_trace fun used in exceptions... - -FOREACH( TestName1 ${TestList} ) - STRING(REPLACE ".cpp" "" TestName ${TestName1}) - add_executable( ${TestName} ${CMAKE_CURRENT_SOURCE_DIR}/${TestName}.cpp ) - add_test_C_simple( ${TestName} ) -ENDFOREACH( TestName1 ${TestList} ) - - diff --git a/doc/reference/c++/arrays_old/CMakeLists.txt.Old b/doc/reference/c++/arrays_old/CMakeLists.txt.Old deleted file mode 100644 index efacff88..00000000 --- a/doc/reference/c++/arrays_old/CMakeLists.txt.Old +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright Olivier Parcollet 2010 -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -# grab all the rst files here.... -EXECUTE_PROCESS(COMMAND find ${CMAKE_CURRENT_SOURCE_DIR} -name "*.rst" OUTPUT_VARIABLE res ) -string(REPLACE "\n" ";" res ${res}) # remove the newlines -SET(SOURCES ${SOURCES} ${res}) # adding to the previous sources -SET(SOURCES ${SOURCES} PARENT_SCOPE) # put it up - -# the doxygen doc -SET(DOXYGEN_SOURCES - ${TRIQS_SOURCE_DIR}/triqs/arrays/h5/simple_read_write.hpp - ${TRIQS_SOURCE_DIR}/triqs/arrays/h5/array_proxy.hpp - ${TRIQS_SOURCE_DIR}/triqs/arrays/h5/array_stack.hpp - ) -SET(DOXYGEN_NAME arrays) -SET(DOXYGEN_HTML_OUTPUT ../html/doxy_arrays) - -include(${TRIQS_SOURCE_DIR}/cmake/BuildDoxygenDocs.cmake) - diff --git a/doc/reference/c++/clef/CMakeLists.txt b/doc/reference/c++/clef/CMakeLists.txt deleted file mode 100644 index 8b137891..00000000 --- a/doc/reference/c++/clef/CMakeLists.txt +++ /dev/null @@ -1 +0,0 @@ - diff --git a/doc/reference/c++/det_manip/CMakeLists.txt b/doc/reference/c++/det_manip/CMakeLists.txt index fb1df62f..6909c7be 100644 --- a/doc/reference/c++/det_manip/CMakeLists.txt +++ b/doc/reference/c++/det_manip/CMakeLists.txt @@ -1,11 +1,2 @@ -# Copyright Olivier Parcollet 2010 -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -# Sphinx sources -#set_property(GLOBAL APPEND PROPERTY SPHINX_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/det_manip.rst) - # Doxygen sources set_property(GLOBAL APPEND PROPERTY DOXYGEN_SOURCES ${TRIQS_SOURCE_DIR}/triqs/det_manip/det_manip.hpp) - diff --git a/doc/reference/c++/gf/CMakeLists.txt b/doc/reference/c++/gf/CMakeLists.txt index acc003ee..88e36173 100644 --- a/doc/reference/c++/gf/CMakeLists.txt +++ b/doc/reference/c++/gf/CMakeLists.txt @@ -1,11 +1,3 @@ -# Copyright Olivier Parcollet 2010 -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -# Sphinx sources -#set_property(GLOBAL APPEND PROPERTY SPHINX_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/det_manip.rst) - # Doxygen sources set_property(GLOBAL APPEND PROPERTY DOXYGEN_SOURCES ${TRIQS_SOURCE_DIR}/triqs/gfs/gf.hpp) diff --git a/doc/reference/c++/parameters/CMakeLists.txt b/doc/reference/c++/parameters/CMakeLists.txt index 127842d6..ca9cb5be 100644 --- a/doc/reference/c++/parameters/CMakeLists.txt +++ b/doc/reference/c++/parameters/CMakeLists.txt @@ -1,3 +1,2 @@ # Doxygen sources set_property(GLOBAL APPEND PROPERTY DOXYGEN_SOURCES ${TRIQS_SOURCE_DIR}/triqs/parameters/parameters.hpp ${TRIQS_SOURCE_DIR}/triqs/parameters/defaults.hpp) - diff --git a/doc/reference/python/CMakeLists.txt b/doc/reference/python/CMakeLists.txt deleted file mode 100644 index 7692b4ac..00000000 --- a/doc/reference/python/CMakeLists.txt +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright Olivier Parcollet 2010 -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -FILE(GLOB_RECURSE SOURCES *.rst) - -configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in ${CMAKE_CURRENT_BINARY_DIR}/conf.py) -EXECUTE_PROCESS(COMMAND sh -c "mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/html") -SET(DOC_SOURCE ${CMAKE_CURRENT_SOURCE_DIR}) -include(${TRIQS_SOURCE_DIR}/cmake/BuildSphinx.cmake) - -install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ COMPONENT documentation DESTINATION share/doc/triqs/user_manual - FILES_MATCHING - PATTERN "*.html" - PATTERN "*.png" - PATTERN "*.js" - PATTERN "_*" - PATTERN "*.png" - PATTERN "*.gif" - PATTERN "*.xsl" - PATTERN "*.css" - PATTERN "*.pdf" - PATTERN "*.py" - PATTERN "*.txt" - PATTERN "*.bib" - PATTERN ".svn" EXCLUDE - PATTERN "CVS" EXCLUDE - ) - - -if (TRIQS_BUILD_STATIC) - add_dependencies(docs_sphinx bin/${ExecutableName} ) # need the executable to build the doc -else (TRIQS_BUILD_STATIC) - GET_PROPERTY(PYTHON_DYNAMIC_MODULES_LIST GLOBAL PROPERTY PYTHON_DYNAMIC_MODULES_LIST) - foreach (mod ${PYTHON_DYNAMIC_MODULES_LIST}) - add_dependencies(docs_sphinx ${mod}) - endforeach (mod ${PYTHON_DYNAMIC_MODULES_LIST}) - -endif (TRIQS_BUILD_STATIC) - -if (Build_PDF_Documentation) - install(FILES ${sphinx_top_pdf} DESTINATION share/doc/triqs/user_manual/) -endif() - diff --git a/doc/reference/python/data_analysis/hdf5/CMakeLists.txt b/doc/reference/python/data_analysis/hdf5/CMakeLists.txt deleted file mode 100644 index 278c5f22..00000000 --- a/doc/reference/python/data_analysis/hdf5/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright Olivier Parcollet 2010 -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) - -# grab all the rst files here.... -EXECUTE_PROCESS(COMMAND find ${CMAKE_CURRENT_SOURCE_DIR} -name "*.rst" OUTPUT_VARIABLE res ) -string(REPLACE "\n" ";" res ${res}) # remove the newlines -SET(SOURCES ${SOURCES} ${res}) # adding to the previous sources -SET(SOURCES ${SOURCES} PARENT_SCOPE) # put it up -