diff --git a/doc/contributing.rst b/doc/contributing.rst index 2828fb187ebe8f6b13116d1e3e966d4e824ae3b1..dff3640e9ad87a0749104b2a3126b0a9c51c5f0e 100644 --- a/doc/contributing.rst +++ b/doc/contributing.rst @@ -348,7 +348,7 @@ top level :file:`CMakeLists.txt`: .. code-block:: cmake :linenos: - :emphasize-lines: 80 + :emphasize-lines: 83 #------------------------------------------------------------------------------- # Author: Bienchen @@ -360,7 +360,7 @@ top level :file:`CMakeLists.txt`: # (if documentation is disabled, there is no doctest, linkcheck at all) cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake_support) - + project(PROMOD3 CXX C) include(PROMOD3) @@ -406,6 +406,7 @@ top level :file:`CMakeLists.txt`: endif() find_package(OPENSTRUCTURE 1.4 REQUIRED COMPONENTS io mol seq seq_alg mol_alg conop) + find_package(QMEAN 1.0 REQUIRED) if (CMAKE_COMPILER_IS_GNUCXX) # do not write back into cache, otherwise the compile command line gets @@ -419,7 +420,8 @@ top level :file:`CMakeLists.txt`: # basic environment include_directories(${Boost_INCLUDE_DIRS} - ${OST_INCLUDE_DIR}) + ${OST_INCLUDE_DIR} + ${QMEAN_INCLUDE_DIR}) set(FILES_TO_BE_REMOVED ${PROJECT_BINARY_DIR}/stage) set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES @@ -429,9 +431,11 @@ top level :file:`CMakeLists.txt`: ## e.g. add_subdirectory(src), subdirs have their own CMakeLists.txt add_subdirectory(config) add_subdirectory(core) + add_subdirectory(meld) add_subdirectory(sidechains) add_subdirectory(scripts) add_subdirectory(actions) + add_subdirectory(extras) if(NOT DISABLE_DOCUMENTATION) add_changelog_to_doc(FILE "${CMAKE_CURRENT_SOURCE_DIR}/CHANGELOG") add_subdirectory(doc) @@ -440,11 +444,12 @@ top level :file:`CMakeLists.txt`: ## report setup message(STATUS "PROMOD3 will be built with the following options:\n" " OpenStructure (-DOST_ROOT) : ${OST_ROOT}\n" + " QMEAN (-DQMEAN_ROOT) : ${QMEAN_ROOT}\n" " Optimized (-DOPTIMIZE) : ${_OPT}\n" " Python : ${PYTHON_BINARY}\n") All that needs to be done for |cmake| to recognise your module is adding its -directory as shown in line 80. +directory as shown in line 83. This was the final step to set up the build system. Running |cmake| at this point would create the build environment in place. But building software in