Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 6 additions & 53 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# ##############################################################################
#
# triqs_dft_tools - An example application using triqs and cpp2py
# triqs_dft_tools - An example application using triqs
#
# Copyright (C) ...
#
Expand All @@ -24,11 +24,11 @@ cmake_policy(VERSION ${CMAKE_VERSION})

# ############
# Define Project
project(triqs_dft_tools VERSION 3.3.1 LANGUAGES C CXX Fortran)
project(triqs_dft_tools VERSION 3.3.1 LANGUAGES CXX Fortran)
get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)

# ############
# Load TRIQS and CPP2PY
# Load TRIQS
find_package(TRIQS 3.3 REQUIRED)

# Get the git hash & print status
Expand Down Expand Up @@ -67,61 +67,19 @@ if(NOT IS_SUBPROJECT)
endif()

# Python Support
option(PythonSupport "Build with Python support" ON)
if(PythonSupport AND NOT TRIQS_WITH_PYTHON_SUPPORT)
if(NOT TRIQS_WITH_PYTHON_SUPPORT)
message(FATAL_ERROR "TRIQS was installed without Python support. Cannot build the Python Interface. Disable the build with -DPythonSupport=OFF")
endif()

# Documentation
option(Build_Documentation "Build documentation" OFF)
if(NOT IS_SUBPROJECT AND (Build_Documentation AND NOT PythonSupport))
message(FATAL_ERROR "Build_Documentation=ON requires PythonSupport to be enabled")
endif()

# Testing
option(Build_Tests "Build tests" ON)
if(Build_Tests)
enable_testing()
endif()

# ############
# Global Compilation Settings

# Build static libraries by default
option(BUILD_SHARED_LIBS "Enable compilation of shared libraries" OFF)

# Export the list of compile-commands into compile_commands.json
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

# Disable compiler extensions
set(CMAKE_CXX_EXTENSIONS OFF)

# Provide additional debugging information for Debug builds
add_compile_options($<$<CONFIG:Debug>:-ggdb3>)

# Create an Interface target for compiler warnings
add_library(${PROJECT_NAME}_warnings INTERFACE)
target_compile_options(${PROJECT_NAME}_warnings
INTERFACE
-Wall
-Wextra
-Wfloat-conversion
-Wpedantic
-Wno-sign-compare
$<$<CXX_COMPILER_ID:GNU>:-Wno-comma-subscript>
$<$<CXX_COMPILER_ID:GNU>:-Wno-psabi> # Disable notes about ABI changes
$<$<CXX_COMPILER_ID:GNU>:-Wshadow=local>
$<$<CXX_COMPILER_ID:GNU>:-Wno-attributes>
$<$<CXX_COMPILER_ID:GNU>:-Wno-deprecated-declarations>
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-deprecated-comma-subscript>
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-unknown-warning-option>
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wshadow>
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-gcc-compat>
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-c++20-extensions>
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-c++20-compat>
$<$<CXX_COMPILER_ID:IntelLLVM>:-Wno-tautological-constant-compare>
)

# Provide GNU Installation directories
include(GNUInstallDirs)

Expand All @@ -131,9 +89,6 @@ include(GNUInstallDirs)
# Find / Build dependencies
add_subdirectory(deps)

# Build and install the library
add_subdirectory(c++/${PROJECT_NAME})

# add here stuff for the Fortran part in DFTTools
add_subdirectory(fortran/dmftproj)

Expand All @@ -143,9 +98,7 @@ if(Build_Tests)
endif()

# Python
if(PythonSupport)
add_subdirectory(python/${PROJECT_NAME})
endif()
add_subdirectory(python/${PROJECT_NAME})

# Docs
if(NOT IS_SUBPROJECT AND Build_Documentation)
Expand All @@ -158,7 +111,7 @@ add_subdirectory(bin)
# Additional configuration files
add_subdirectory(share)

# add packaging for automatic Versioning
# add packaging for automatic versioning
add_subdirectory(packaging)

# #############
Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ properties([
def platforms = [:]

/****************** linux builds (in docker) */
/* Each platform must have a corresponding Dockerfile.PLATFORM in triqs/packaging */
def dockerPlatforms = ["ubuntu-clang", "ubuntu-gcc", "ubuntu-intel", "sanitize"]
/* Each platform must have a cooresponding Dockerfile.PLATFORM in triqs/packaging */
def dockerPlatforms = ["ubuntu-clang", "ubuntu-gcc"]
/* .each is currently broken in jenkins */
for (int i = 0; i < dockerPlatforms.size(); i++) {
def platform = dockerPlatforms[i]
Expand Down
1 change: 0 additions & 1 deletion c++/CMakeLists.txt

This file was deleted.

101 changes: 0 additions & 101 deletions c++/triqs_dft_tools/CMakeLists.txt

This file was deleted.

3 changes: 0 additions & 3 deletions c++/triqs_dft_tools/converters/vasp.hpp

This file was deleted.

27 changes: 0 additions & 27 deletions c++/triqs_dft_tools/converters/vasp/__init__.py

This file was deleted.

67 changes: 0 additions & 67 deletions c++/triqs_dft_tools/converters/vasp/argsort.cpp

This file was deleted.

27 changes: 0 additions & 27 deletions c++/triqs_dft_tools/converters/vasp/argsort.hpp

This file was deleted.

Loading
Loading