From d02eff9ce350d337c0517386e96ede57f3234c1d Mon Sep 17 00:00:00 2001 From: Nils Wentzell Date: Wed, 26 Jun 2019 11:35:52 -0400 Subject: [PATCH] [cmake] Consistently use PROJECT_SOURCE_DIR over CMAKE_SOURCE_DIR --- c++/app4triqs/CMakeLists.txt | 2 +- doc/CMakeLists.txt | 2 +- doc/conf.py.in | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/c++/app4triqs/CMakeLists.txt b/c++/app4triqs/CMakeLists.txt index 7bf1b64c..26584a97 100644 --- a/c++/app4triqs/CMakeLists.txt +++ b/c++/app4triqs/CMakeLists.txt @@ -6,7 +6,7 @@ target_link_libraries(app4triqs_c PUBLIC triqs PRIVATE project_warnings) # Configure compilation target_compile_options(app4triqs_c PUBLIC -fPIC) -target_include_directories(app4triqs_c PUBLIC $) +target_include_directories(app4triqs_c PUBLIC $) target_compile_definitions(app4triqs_c PUBLIC APP4TRIQS_GIT_HASH=${APP4TRIQS_GIT_HASH} TRIQS_GIT_HASH=${TRIQS_GIT_HASH} diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt index 2c1e3366..75f0ca56 100644 --- a/doc/CMakeLists.txt +++ b/doc/CMakeLists.txt @@ -49,7 +49,7 @@ macro(generate_docs header_file) ) endmacro(generate_docs) -generate_docs(${CMAKE_SOURCE_DIR}/c++/app4triqs/toto.hpp) +generate_docs(${PROJECT_SOURCE_DIR}/c++/app4triqs/toto.hpp) # --------------------------------- # Install diff --git a/doc/conf.py.in b/doc/conf.py.in index 32b6f1a3..fbeb2309 100644 --- a/doc/conf.py.in +++ b/doc/conf.py.in @@ -24,7 +24,7 @@ copyright = u'2017-2018 N. Wentzell, O. Parcollet 2018-2019 The Simons Foundatio version = '@APP4TRIQS_VERSION@' mathjax_path = "@TRIQS_MATHJAX_PATH@/MathJax.js?config=default" -templates_path = ['@CMAKE_SOURCE_DIR@/doc/_templates'] +templates_path = ['@PROJECT_SOURCE_DIR@/doc/_templates'] html_theme = 'triqs' html_theme_path = ['@TRIQS_THEMES_PATH@'] @@ -35,7 +35,7 @@ html_context = {'header_title': 'app4triqs', ['Documentation', 'documentation'], ['Issues', 'issues'], ['About app4triqs', 'about']]} -html_static_path = ['@CMAKE_SOURCE_DIR@/doc/_static'] +html_static_path = ['@PROJECT_SOURCE_DIR@/doc/_static'] html_sidebars = {'index': ['sideb.html', 'searchbox.html']} htmlhelp_basename = 'APP4TRIQSdoc'