LCPQ/dft_tools
3
0
Fork 0
mirror of https://github.com/triqs/dft_tools synced 2024-11-07 22:53:50 +01:00
Code Issues Releases Wiki Activity

Prepare top-level CMakeLists.txt for triqs@2.1 compatible release

Browse Source
This commit is contained in:
Nils Wentzell 2019-04-16 11:09:27 -04:00
parent 203783ceba
commit 800ef7c0b4
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
CMakeLists.txt
View File

@ -1,18 +1,21 @@
# Start configuration
cmake_minimum_required(VERSION 2.8)
project(dft_tools C CXX Fortran)
if(POLICY CMP0074)
cmake_policy(SET CMP0074 NEW)
endif()
# Default to Release build type # Default to Release build type
if(NOT CMAKE_BUILD_TYPE) if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Release CACHE STRING "Type of build" FORCE) set(CMAKE_BUILD_TYPE Release CACHE STRING "Type of build" FORCE)
endif() endif()
message( STATUS "-------- BUILD-TYPE: ${CMAKE_BUILD_TYPE} -------------") message( STATUS "-------- BUILD-TYPE: ${CMAKE_BUILD_TYPE} -------------")
# start configuration
cmake_minimum_required(VERSION 2.8)
project(dft_tools C CXX Fortran)
# Use shared libraries # Use shared libraries
set(BUILD_SHARED_LIBS ON) set(BUILD_SHARED_LIBS ON)
# Load TRIQS and Cpp2Py # Load TRIQS and Cpp2Py
find_package(TRIQS 2.0 REQUIRED) find_package(TRIQS 2.1 REQUIRED)
find_package(Cpp2Py 1.5 REQUIRED) find_package(Cpp2Py 1.5 REQUIRED)
if (NOT ${TRIQS_WITH_PYTHON_SUPPORT}) if (NOT ${TRIQS_WITH_PYTHON_SUPPORT})
@ -26,17 +29,13 @@ if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT OR (NOT IS_ABSOLUTE ${CMAKE_INSTA
endif() endif()
message(STATUS "-------- CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX} -------------") message(STATUS "-------- CMAKE_INSTALL_PREFIX: ${CMAKE_INSTALL_PREFIX} -------------")
# Use git to detect Cthyb version and git hash # Define the dft_tools version numbers and get the git hash
execute_process(COMMAND bash "-c" "${TRIQS_GIT_EXECUTABLE} describe | sed \"s/-\\([0-9]*\\)-.*/.\\1/g\"" set(DFT_TOOLS_VERSION_MAJOR 2)
WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}" set(DFT_TOOLS_VERSION_MINOR 1)
OUTPUT_VARIABLE DFT_TOOLS_VERSION set(DFT_TOOLS_VERSION_PATCH 0)
OUTPUT_STRIP_TRAILING_WHITESPACE set(DFT_TOOLS_VERSION ${DFT_TOOLS_VERSION_MAJOR}.${DFT_TOOLS_VERSION_MINOR}.${DFT_TOOLS_VERSION_PATCH})
)
if(NOT DFT_TOOLS_VERSION)
set(DFT_TOOLS_VERSION 1.5)
endif()
triqs_get_git_hash_of_source_dir(DFT_TOOLS_GIT_HASH) triqs_get_git_hash_of_source_dir(DFT_TOOLS_GIT_HASH)
MESSAGE(STATUS "Dft_tools version : ${DFT_TOOLS_VERSION}") message(STATUS "Dft_tools version : ${DFT_TOOLS_VERSION}")
message(STATUS "Git hash: ${DFT_TOOLS_GIT_HASH}") message(STATUS "Git hash: ${DFT_TOOLS_GIT_HASH}")
add_subdirectory(fortran/dmftproj) add_subdirectory(fortran/dmftproj)
@ -98,7 +97,7 @@ if(BUILD_DEBIAN_PACKAGE)
SET(CPACK_PACKAGE_VERSION ${DFT_TOOLS_VERSION}) SET(CPACK_PACKAGE_VERSION ${DFT_TOOLS_VERSION})
SET(CPACK_PACKAGE_CONTACT "https://github.com/TRIQS/dft_tools") SET(CPACK_PACKAGE_CONTACT "https://github.com/TRIQS/dft_tools")
EXECUTE_PROCESS(COMMAND dpkg --print-architecture OUTPUT_VARIABLE CMAKE_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE) EXECUTE_PROCESS(COMMAND dpkg --print-architecture OUTPUT_VARIABLE CMAKE_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
SET(CPACK_DEBIAN_PACKAGE_DEPENDS "python, python-numpy, python-h5py, python-jinja2, python-mako, python-mpi4py, python-matplotlib, python-scipy, triqs (>= 2.0)") SET(CPACK_DEBIAN_PACKAGE_DEPENDS "triqs (>= 2.1)")
SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) SET(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
SET(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON) SET(CPACK_DEBIAN_PACKAGE_GENERATE_SHLIBS ON)
INCLUDE(CPack) INCLUDE(CPack)

1
doc/install.rst
View File

@ -36,7 +36,6 @@ Installation steps
#. Make sure that you have added the TRIQS and Cpp2Py installation to your environment variables:: #. Make sure that you have added the TRIQS and Cpp2Py installation to your environment variables::
$ source path_to_triqs/share/cpp2pyvarsh.sh
$ source path_to_triqs/share/triqsvarsh.sh $ source path_to_triqs/share/triqsvarsh.sh
#. Compile the code, run the tests and install the application:: #. Compile the code, run the tests and install the application::