LCPQ/dft_tools
3
0
Fork 0
mirror of https://github.com/triqs/dft_tools synced 2024-06-29 00:15:00 +02:00
Code Issues Releases Wiki Activity

[cmake] Enable CMP0074, adjust if(obj) statements

Browse Source
This commit is contained in:
Nils Wentzell 2018-11-20 17:53:10 -05:00
parent 24d619b8be
commit 46cbea69d9
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CMakeLists.txt
View File

@ -1,6 +1,9 @@
# Start configuration # Start configuration
cmake_minimum_required(VERSION 2.8.12) cmake_minimum_required(VERSION 2.8.12)
project(app4triqs CXX) project(app4triqs CXX)
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)
@ -51,7 +54,7 @@ endif()
# Tests # Tests
option(Build_Tests "Build tests" ON) option(Build_Tests "Build tests" ON)
if(${Build_Tests}) if(Build_Tests)
enable_testing() enable_testing()
add_subdirectory(test) add_subdirectory(test)
endif() endif()
@ -60,10 +63,11 @@ endif()
add_subdirectory(share) add_subdirectory(share)
option(Build_Documentation "Build documentation" OFF) option(Build_Documentation "Build documentation" OFF)
if(${Build_Documentation}) if(Build_Documentation)
if(NOT ${TRIQS_WITH_DOCUMENTATION}) if(NOT TRIQS_WITH_DOCUMENTATION)
message("Error: TRIQS library has not been compiled with its documentation") message(WARNING "TRIQS library has not been compiled with its documentation! Cannot build documentation.")
else() else()
message(STATUS "Documentation Build enabled")
add_subdirectory(doc) add_subdirectory(doc)
endif() endif()
endif() endif()

2
share/cmake/Findlibasan_rt.cmake
View File

@ -28,7 +28,7 @@ find_library(ASAN_RT_LIBRARY
NAMES ${name} NAMES ${name}
PATHS PATHS
ENV LIBRARY_PATH ENV LIBRARY_PATH
ENV LD_INCLUDE_PATH ENV LD_LIBRARY_PATH
/usr/lib /usr/lib
/usr/local/lib /usr/local/lib
/usr/lib/gcc/*/7 /usr/lib/gcc/*/7

2
share/cmake/Findlibubsan_rt.cmake
View File

@ -19,7 +19,7 @@
set(TRIAL_PATHS set(TRIAL_PATHS
ENV LIBRARY_PATH ENV LIBRARY_PATH
ENV LD_INCLUDE_PATH ENV LD_LIBRARY_PATH
/usr/lib /usr/lib
/usr/local/lib /usr/local/lib
/usr/lib/gcc/7/* /usr/lib/gcc/7/*