diff --git a/CMakeLists.txt b/CMakeLists.txt index e4a2b692..521bb4ab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,7 +25,7 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR (NOT IS_ABSOLUTE ${CMAKE_INSTA endif() message(STATUS "-------- INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX} --------") -# Use git to detect App4Triqs version and git hash +# Use git to detect app4triqs version and git hash execute_process(COMMAND bash "-c" "${TRIQS_GIT_EXECUTABLE} describe | sed \"s/-\\([0-9]*\\)-.*/.\\1/g\"" WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" OUTPUT_VARIABLE APP4TRIQS_VERSION diff --git a/README.md b/README.md index 64b4af2f..16c57cc7 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,9 @@ To use this skeleton for a new triqs application, the following steps are necess ```bash git clone https://github.com/triqs/app4triqs --branch unstable mynewapp cd mynewapp -git remote set-url https://github.com/myuser/mynewapp +git remote set-url origin https://github.com/myuser/mynewapp find . -type f | grep -v .git | xargs sed -i 's/app4triqs/mynewapp/g; s/APP4TRIQS/MYNEWAPP/g' -find . | grep -v .git | xargs rename app4triqs mytriqsapp +find . | grep -v .git | xargs rename 's/app4triqs/mytriqsapp/' git add -A git commit -m "Create mynewapp from github.com/triqs/app4triqs skeleton" git push diff --git a/c++/app4triqs/CMakeLists.txt b/c++/app4triqs/CMakeLists.txt index 2674e7a9..24344a90 100644 --- a/c++/app4triqs/CMakeLists.txt +++ b/c++/app4triqs/CMakeLists.txt @@ -16,7 +16,7 @@ target_compile_definitions(app4triqs_c PRIVATE # Install library and headers install(TARGETS app4triqs_c EXPORT app4triqs-targets DESTINATION lib) -install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h") +install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} DESTINATION include/app4triqs FILES_MATCHING PATTERN "*.hpp" PATTERN "*.h") # ========= Static Analyzer Checks ==========