Skip to content

Commit e51cca9

Browse files
authored
Merge pull request #283 from TRIQS/DEV_RM_C_CODE
Remove C code from the dft_tools project
2 parents c4c980d + 0298f18 commit e51cca9

32 files changed

+255
-1218
lines changed

CMakeLists.txt

Lines changed: 6 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# ##############################################################################
22
#
3-
# triqs_dft_tools - An example application using triqs and cpp2py
3+
# triqs_dft_tools - An example application using triqs
44
#
55
# Copyright (C) ...
66
#
@@ -24,11 +24,11 @@ cmake_policy(VERSION ${CMAKE_VERSION})
2424

2525
# ############
2626
# Define Project
27-
project(triqs_dft_tools VERSION 3.3.1 LANGUAGES C CXX Fortran)
27+
project(triqs_dft_tools VERSION 3.3.1 LANGUAGES CXX Fortran)
2828
get_directory_property(IS_SUBPROJECT PARENT_DIRECTORY)
2929

3030
# ############
31-
# Load TRIQS and CPP2PY
31+
# Load TRIQS
3232
find_package(TRIQS 3.3 REQUIRED)
3333

3434
# Get the git hash & print status
@@ -67,61 +67,19 @@ if(NOT IS_SUBPROJECT)
6767
endif()
6868

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

7574
# Documentation
7675
option(Build_Documentation "Build documentation" OFF)
77-
if(NOT IS_SUBPROJECT AND (Build_Documentation AND NOT PythonSupport))
78-
message(FATAL_ERROR "Build_Documentation=ON requires PythonSupport to be enabled")
79-
endif()
8076

8177
# Testing
8278
option(Build_Tests "Build tests" ON)
8379
if(Build_Tests)
8480
enable_testing()
8581
endif()
8682

87-
# ############
88-
# Global Compilation Settings
89-
90-
# Build static libraries by default
91-
option(BUILD_SHARED_LIBS "Enable compilation of shared libraries" OFF)
92-
93-
# Export the list of compile-commands into compile_commands.json
94-
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
95-
96-
# Disable compiler extensions
97-
set(CMAKE_CXX_EXTENSIONS OFF)
98-
99-
# Provide additional debugging information for Debug builds
100-
add_compile_options($<$<CONFIG:Debug>:-ggdb3>)
101-
102-
# Create an Interface target for compiler warnings
103-
add_library(${PROJECT_NAME}_warnings INTERFACE)
104-
target_compile_options(${PROJECT_NAME}_warnings
105-
INTERFACE
106-
-Wall
107-
-Wextra
108-
-Wfloat-conversion
109-
-Wpedantic
110-
-Wno-sign-compare
111-
$<$<CXX_COMPILER_ID:GNU>:-Wno-comma-subscript>
112-
$<$<CXX_COMPILER_ID:GNU>:-Wno-psabi> # Disable notes about ABI changes
113-
$<$<CXX_COMPILER_ID:GNU>:-Wshadow=local>
114-
$<$<CXX_COMPILER_ID:GNU>:-Wno-attributes>
115-
$<$<CXX_COMPILER_ID:GNU>:-Wno-deprecated-declarations>
116-
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-deprecated-comma-subscript>
117-
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-unknown-warning-option>
118-
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wshadow>
119-
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-gcc-compat>
120-
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-c++20-extensions>
121-
$<$<CXX_COMPILER_ID:AppleClang,Clang,IntelLLVM>:-Wno-c++20-compat>
122-
$<$<CXX_COMPILER_ID:IntelLLVM>:-Wno-tautological-constant-compare>
123-
)
124-
12583
# Provide GNU Installation directories
12684
include(GNUInstallDirs)
12785

@@ -131,9 +89,6 @@ include(GNUInstallDirs)
13189
# Find / Build dependencies
13290
add_subdirectory(deps)
13391

134-
# Build and install the library
135-
add_subdirectory(c++/${PROJECT_NAME})
136-
13792
# add here stuff for the Fortran part in DFTTools
13893
add_subdirectory(fortran/dmftproj)
13994

@@ -143,9 +98,7 @@ if(Build_Tests)
14398
endif()
14499

145100
# Python
146-
if(PythonSupport)
147-
add_subdirectory(python/${PROJECT_NAME})
148-
endif()
101+
add_subdirectory(python/${PROJECT_NAME})
149102

150103
# Docs
151104
if(NOT IS_SUBPROJECT AND Build_Documentation)
@@ -158,7 +111,7 @@ add_subdirectory(bin)
158111
# Additional configuration files
159112
add_subdirectory(share)
160113

161-
# add packaging for automatic Versioning
114+
# add packaging for automatic versioning
162115
add_subdirectory(packaging)
163116

164117
# #############

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ properties([
2424
def platforms = [:]
2525

2626
/****************** linux builds (in docker) */
27-
/* Each platform must have a corresponding Dockerfile.PLATFORM in triqs/packaging */
28-
def dockerPlatforms = ["ubuntu-clang", "ubuntu-gcc", "ubuntu-intel", "sanitize"]
27+
/* Each platform must have a cooresponding Dockerfile.PLATFORM in triqs/packaging */
28+
def dockerPlatforms = ["ubuntu-clang", "ubuntu-gcc"]
2929
/* .each is currently broken in jenkins */
3030
for (int i = 0; i < dockerPlatforms.size(); i++) {
3131
def platform = dockerPlatforms[i]

c++/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

c++/triqs_dft_tools/CMakeLists.txt

Lines changed: 0 additions & 101 deletions
This file was deleted.

c++/triqs_dft_tools/converters/vasp.hpp

Lines changed: 0 additions & 3 deletions
This file was deleted.

c++/triqs_dft_tools/converters/vasp/__init__.py

Lines changed: 0 additions & 27 deletions
This file was deleted.

c++/triqs_dft_tools/converters/vasp/argsort.cpp

Lines changed: 0 additions & 67 deletions
This file was deleted.

c++/triqs_dft_tools/converters/vasp/argsort.hpp

Lines changed: 0 additions & 27 deletions
This file was deleted.

0 commit comments

Comments
 (0)