Adjust app4triqs skeleton for python-only projects

Author: Wentzell

CMakeLists.txt

@@ -24,7 +24,7 @@ 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)
 
 # ############
@@ -66,6 +66,11 @@ if(NOT IS_SUBPROJECT)
   message(STATUS "-------- BUILD-TYPE: ${CMAKE_BUILD_TYPE} --------")
 endif()
 
+# 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)
 
@@ -75,44 +80,6 @@ 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)
 
@@ -144,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)
 
 # #############

Jenkinsfile

@@ -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]

deps/CMakeLists.txt

@@ -46,11 +46,3 @@ else()
     message(WARNING "For builds with llvm sanitizers (ASAN/UBSAN) it is recommended to use -DBuild_Deps=Always to avoid false positives.")
   endif()
 endif()
-
-# -- GTest --
-external_dependency(GTest
-  GIT_REPO https://github.com/google/googletest
-  GIT_TAG main
-  BUILD_ALWAYS
-  EXCLUDE_FROM_ALL
-)

doc/CMakeLists.txt

@@ -1,51 +1,6 @@
 # Generate the sphinx config file
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/conf.py.in ${CMAKE_CURRENT_BINARY_DIR}/conf.py @ONLY)
 
-# -----------------------------------------------------------------------------
-# Create an optional target that allows us to regenerate the C++ doc with c++2rst
-# -----------------------------------------------------------------------------
-add_custom_target(${PROJECT_NAME}_docs_cpp2rst)
-include(${PROJECT_SOURCE_DIR}/share/cmake/extract_flags.cmake)
-extract_flags(${PROJECT_NAME}_c BUILD_INTERFACE)
-separate_arguments(${PROJECT_NAME}_c_CXXFLAGS)
-macro(generate_docs header_file)
-  add_custom_command(
-    TARGET ${PROJECT_NAME}_docs_cpp2rst
-    POST_BUILD
-    COMMAND rm -rf ${CMAKE_CURRENT_SOURCE_DIR}/cpp2rst_generated
-    COMMAND
-      PYTHONPATH=${CPP2PY_BINARY_DIR}:$ENV{PYTHONPATH}
-      PATH=${CPP2PY_BINARY_DIR}/bin:${CPP2PY_ROOT}/bin:$ENV{PATH}
-      c++2rst
-      ${header_file}
-      -N ${PROJECT_NAME}
-      --output_directory ${CMAKE_CURRENT_SOURCE_DIR}/cpp2rst_generated
-      -I${PROJECT_SOURCE_DIR}/c++
-      --cxxflags="${${PROJECT_NAME}_c_CXXFLAGS}"
-  )
-endmacro(generate_docs)
-
-generate_docs(${PROJECT_SOURCE_DIR}/c++/${PROJECT_NAME}/${PROJECT_NAME}.hpp)
-
-# --------------------------------------------------------
-# Build & Run the C++ doc examples and capture the output
-# --------------------------------------------------------
-
-add_custom_target(${PROJECT_NAME}_docs_example_output)
-file(GLOB_RECURSE ExampleList RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
-foreach(example ${ExampleList})
-  get_filename_component(f ${example} NAME_WE)
-  get_filename_component(d ${example} DIRECTORY)
-  add_executable(${PROJECT_NAME}_doc_${f} EXCLUDE_FROM_ALL ${example})
-  set_property(TARGET ${PROJECT_NAME}_doc_${f} PROPERTY RUNTIME_OUTPUT_DIRECTORY ${d})
-  target_link_libraries(${PROJECT_NAME}_doc_${f} triqs)
-  add_custom_command(TARGET ${PROJECT_NAME}_doc_${f} POST_BUILD
-   COMMAND ${PROJECT_NAME}_doc_${f} > ${CMAKE_CURRENT_SOURCE_DIR}/${d}/${f}.output 2>/dev/null
-   WORKING_DIRECTORY ${d}
-  )
-  add_dependencies(${PROJECT_NAME}_docs_example_output ${PROJECT_NAME}_doc_${f})
-endforeach()
-
 # ---------------------------------
 # Top Sphinx target
 # ---------------------------------
@@ -61,18 +16,6 @@ add_custom_command(
   COMMAND PYTHONPATH=${PROJECT_BINARY_DIR}/python:$ENV{PYTHONPATH} ${SPHINXBUILD_EXECUTABLE} -j auto -c . -b html ${CMAKE_CURRENT_SOURCE_DIR} html
 )
 
-option(Sphinx_Only "When building the documentation, skip the Python Modules and the generation of C++ Api and example outputs" OFF)
-if(NOT Sphinx_Only)
-  # Autodoc usage requires the python modules to be built first
-  get_property(CPP2PY_MODULES_LIST GLOBAL PROPERTY CPP2PY_MODULES_LIST)
-  if(CPP2PY_MODULES_LIST)
-    add_dependencies(${PROJECT_NAME}_docs_sphinx ${CPP2PY_MODULES_LIST})
-  endif()
-
-  # Generation of C++ Api and Example Outputs
-  add_dependencies(${PROJECT_NAME}_docs_sphinx ${PROJECT_NAME}_docs_cpp2rst ${PROJECT_NAME}_docs_example_output)
-endif()
-
 # ---------------------------------
 # Install
 # ---------------------------------

doc/install.rst

@@ -67,7 +67,6 @@ Installation steps
 
 #. Compile the code, run the tests and install the application::
 
-     $ make
      $ make test
      $ make install
 

share/cmake/triqs_dft_tools-config.cmake.in

@@ -23,8 +23,8 @@ set(@PROJECT_NAME@_ROOT @CMAKE_INSTALL_PREFIX@ CACHE STRING "@PROJECT_NAME@ root
 #endfunction()
 #find_dep(depname 1.0)
 
-# Include the exported targets of this project
-include(@CMAKE_INSTALL_FULL_LIBDIR@/cmake/@PROJECT_NAME@/@PROJECT_NAME@-targets.cmake)
+## Include the exported targets of this project
+#include(@CMAKE_INSTALL_FULL_LIBDIR@/cmake/@PROJECT_NAME@/@[email protected])
 
 message(STATUS "Found @[email protected] with version @PROJECT_VERSION@, hash = @PROJECT_GIT_HASH@, root = @CMAKE_INSTALL_PREFIX@")
 

test/python/CMakeLists.txt

@@ -15,5 +15,5 @@ foreach(test ${all_tests})
   get_filename_component(test_name ${test} NAME_WE)
   get_filename_component(test_dir ${test} DIRECTORY)
   add_test(NAME Py_${test_name} COMMAND ${TRIQS_PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/${test_dir}/${test_name}.py WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${test_dir})
-  set_property(TEST Py_${test_name} APPEND PROPERTY ENVIRONMENT PYTHONPATH=${PROJECT_BINARY_DIR}/python:$ENV{PYTHONPATH} ${SANITIZER_RT_PRELOAD})
+  set_property(TEST Py_${test_name} APPEND PROPERTY ENVIRONMENT PYTHONPATH=${PROJECT_BINARY_DIR}/python:$ENV{PYTHONPATH})
 endforeach()