From 573b4c000316cde21dcceaf22e91f4e94ed3e690 Mon Sep 17 00:00:00 2001 From: Curve Date: Mon, 20 Nov 2023 20:28:35 +0100 Subject: [PATCH 01/41] refactor(cmake): add `CPM.cmake`, restructure CMakeLists --- CMakeLists.txt | 429 +++---- cmake/ViennaLSConfig.cmake.in | 73 -- cmake/cpm.cmake | 1155 +++++++++++++++++++ cmake/prepare.cmake | 25 - external/upstream/CMakeLists.txt | 38 - external/upstream/pybind11/CMakeLists.txt | 66 -- external/upstream/viennahrle/CMakeLists.txt | 58 - external/upstream/vtk/CMakeLists.txt | 160 --- 8 files changed, 1289 insertions(+), 715 deletions(-) delete mode 100644 cmake/ViennaLSConfig.cmake.in create mode 100644 cmake/cpm.cmake delete mode 100644 cmake/prepare.cmake delete mode 100644 external/upstream/CMakeLists.txt delete mode 100644 external/upstream/pybind11/CMakeLists.txt delete mode 100644 external/upstream/viennahrle/CMakeLists.txt delete mode 100644 external/upstream/vtk/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index d814d051..bb6cd503 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,328 +1,167 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR) +project(ViennaLS LANGUAGES CXX VERSION 2.1.0) -project(ViennaLS VERSION 2.1.0) +# -------------------------------------------------------------------------------------------------------- +# Library options +# -------------------------------------------------------------------------------------------------------- -# Store version in cache -set(VIENNALS_VERSION - ${PROJECT_VERSION} - CACHE STRING "The version of ViennaLS" FORCE) +option(VIENNALS_USE_VTK "Build with VTK file support" ON) -set(CMAKE_EXPORT_COMPILE_COMMANDS ON) -set(CMAKE_CXX_STANDARD "17") +option(VIENNALS_PRECOMPILE_HEADERS "Build template specialisations for shorter compile times" OFF) +option(VIENNALS_STATIC_BUILD "Build dependencies as static libraries" OFF) -add_definitions(-DVIENNALS_VERSION=${PROJECT_VERSION}) +option(VIENNALS_BUILD_EXAMPLES "Build examples" OFF) +option(VIENNALS_BUILD_TESTS "Build tests" OFF) -include(GNUInstallDirs) +# -------------------------------------------------------------------------------------------------------- +# Conditional Library options +# -------------------------------------------------------------------------------------------------------- -# Setup of default build type -set(DEFAULT_BUILD_TYPE "Release") -if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES) - message(STATUS "Setting build type to '${DEFAULT_BUILD_TYPE}' as none was specified.") - set(CMAKE_BUILD_TYPE - "${DEFAULT_BUILD_TYPE}" - CACHE STRING "Choose the type of build." FORCE) - # Set the possible values of build type for cmake-gui - set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" - "RelWithDebInfo") -endif() +include(CMakeDependentOption) -# Tell VS to export all symbols to its dll files -if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS - TRUE - CACHE BOOL "Export all symbols" FORCE) - add_compile_definitions(_USE_MATH_DEFINES) -endif() +cmake_dependent_option(VIENNALS_BUILD_PYTHON "Build for Python (>=3)" OFF "VIENNALS_USE_VTK" OFF) -# ################################################################################################## -# CONFIGURATION OPTIONS -# ################################################################################################## -include(CMakeDependentOption) +# -------------------------------------------------------------------------------------------------------- +# Ensure valid options +# -------------------------------------------------------------------------------------------------------- -# Whether to build ViennaLS with VTK support or not -option(VIENNALS_USE_VTK "Build with VTK file support." ON) - -# Build the included examples -option(VIENNALS_BUILD_EXAMPLES "Build examples." OFF) - -# Build the included tests -option(VIENNALS_BUILD_TESTS "Build tests." OFF) - -# Build ViennaLS as a shared library -option(VIENNALS_PRECOMPILE_HEADERS "Build template specialisations for shorter compile times." OFF) - -# Build Python bindings (only available when VIENNALS_USE_VTK is enabled) -cmake_dependent_option(VIENNALS_BUILD_PYTHON "Build for python3.x." OFF "VIENNALS_USE_VTK" OFF) - -# Statically link dependencies, and if VIENNALS_PRECOMPILE_HEADERS is enabled, ViennaLS will also be -# built as a static library -option( - VIENNALS_STATIC_BUILD - "Build dependencies as static libraries. If VIENNALS_PRECOMPILE_HEADERS is enabled those will also be built in a way that allows for static linking." - OFF) - -# ################################################################################################## -# AUTOMATIC DEPENDENCY PREPARATION -# ################################################################################################## - -# With the stampfile mechanism, cmake automatically retriggers the configure step after the -# buildDependencies targed has been executed. Thus all dependencies that were built with -# buildDependencies should then be made available by the find_package calls. -set(STAMPFILE ${CMAKE_BINARY_DIR}/target.stamp) -# When the buildDependencies target is executed, the stamp file is touched -add_custom_target(buildDependencies COMMAND ${CMAKE_COMMAND} -E touch ${STAMPFILE}) - -# Include the external dependencies -include(ExternalProject) -if(NOT DEFINED VIENNALS_DEPENDENCIES_DIR) - set(DEPENDENCIES_DIR ${CMAKE_SOURCE_DIR}/dependencies) -else() - set(DEPENDENCIES_DIR - ${VIENNALS_DEPENDENCIES_DIR} - CACHE PATH "Directory for downloading, building and installing external dependencies") +if (VIENNALS_STATIC_BUILD) + message(STATUS "[ViennaLS] Enabling precompiled headers for static build") + set(VIENNALS_PRECOMPILE_HEADERS ON) endif() -add_subdirectory(external/upstream) - -# Create the initial stamp file -file(TOUCH ${STAMPFILE}) -# Include the stamp file, so that cmake is forced to re-run once the file has been touched -include(${STAMPFILE}) - -# Binary store the binary directory for use in subprojects -set(ViennaLS_BINARY_DIR - ${PROJECT_BINARY_DIR} - CACHE PATH "Path to local ViennaLS installation" FORCE) - -# ################################################################################################## -# VTK CONFIGURATION VARIABLES SETUP -# ################################################################################################## -if(VIENNALS_USE_VTK) - add_compile_definitions(VIENNALS_USE_VTK) - - # use VTK_USE_FILE for older versions of VTK - if(VTK_VERSION VERSION_LESS "9.0") - message(STATUS "Using old VTK Version: ${VTK_VERSION}") - set(VTK_COMPONENTS - vtkCommonCore;vtkIOCore;vtkIOXML;vtkIOXMLParser;vtkFiltersCore;vtkFiltersGeneral;vtkFiltersGeometry - ) - # find_package is only required for populating the VTK_USE_FILE variable. This case is only - # invoked when an external VTK installation is used since our externalproject build already - # provides a newer version of VTK. Thus the find_package call *SHOULD* not fail. - find_package(VTK CONFIG REQUIRED PATHS ${VTK_DIR} COMPONENTS ${VTK_COMPONENTS} NO_DEFAULT_PATH) - set(VTK_LIBRARIES - vtksys;vtkIOCore;vtkexpat;vtklz4;vtkzlib;vtklzma;vtkdoubleconversion;vtkCommonMisc;vtkCommonSystem;vtkIOXML;vtkFiltersCore;vtkFiltersGeneral;vtkFiltersGeometry;vtkCommonExecutionModel;vtkCommonDataModel;vtkCommonColor;vtkIOXMLParser;vtkIOCore;vtkCommonMisc;vtkCommonComputationalGeometry;vtkCommonTransforms;vtkCommonMath - ) - include(${VTK_USE_FILE}) - else() - # Use the new component names instead of the old vtk* ones - set(VTK_COMPONENTS - CommonCore;IOCore;IOXML;IOXMLParser;FiltersCore;FiltersGeneral;FiltersGeometry) - # For newer versions of VTK, only the target syntax is supported. This also automatically adds - # the vtk include directories. - set(VTK_LIBRARIES - VTK::CommonComputationalGeometry;VTK::CommonCore;VTK::CommonDataModel;VTK::CommonExecutionModel;VTK::CommonMath;VTK::CommonMisc;VTK::CommonSystem;VTK::CommonTransforms;VTK::FiltersCore;VTK::FiltersGeneral;VTK::FiltersGeometry;VTK::IOCore;VTK::IOXML;VTK::IOXMLParser;VTK::WrappingTools - ) - endif() - list(APPEND VIENNALS_LIBRARIES ${VTK_LIBRARIES}) + +# -------------------------------------------------------------------------------------------------------- +# CMake / CPM Options +# -------------------------------------------------------------------------------------------------------- + +if(MSVC) + set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) endif() -# ################################################################################################## -# DEPENDENCY CHECKS -# ################################################################################################## -set(DEPENDENCIES_FOUND TRUE) +set(CPM_USE_LOCAL_PACKAGES ON) -find_package(OpenMP REQUIRED) -list(APPEND VIENNALS_LIBRARIES OpenMP::OpenMP_CXX) +# -------------------------------------------------------------------------------------------------------- +# Setup Library +# -------------------------------------------------------------------------------------------------------- -list(APPEND VIENNALS_DEPENDENCIES "viennahrle_external") -find_package(ViennaHRLE QUIET CONFIG PATHS ${ViennaHRLE_DIR} NO_DEFAULT_PATH) -if(NOT ViennaHRLE_FOUND) - set(DEPENDENCIES_FOUND FALSE) -endif() +add_library(${PROJECT_NAME} INTERFACE) +add_library(ViennaTools::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) -if(VIENNALS_USE_VTK) - list(APPEND VIENNALS_DEPENDENCIES "vtk_external") - find_package(VTK QUIET PATHS ${VTK_DIR} COMPONENTS ${VTK_COMPONENTS} NO_DEFAULT_PATH) - if(NOT VTK_FOUND) - set(DEPENDENCIES_FOUND FALSE) - endif() +target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_17) +set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF CXX_STANDARD_REQUIRED ON) + +if (MSVC) + # https://learn.microsoft.com/cpp/c-runtime-library/math-constants + # TODO: In case C++20 is adpoted any time soon: https://cppreference.com/w/cpp/numeric/constants + + target_compile_definitions(${PROJECT_NAME} INTERFACE _USE_MATH_DEFINES=1) endif() -if(VIENNALS_BUILD_PYTHON) - list(APPEND VIENNALS_DEPENDENCIES "pybind11_external") - find_package(pybind11 QUIET PATHS ${pybind11_DIR} NO_DEFAULT_PATH) - if(NOT pybind11_FOUND) - set(DEPENDENCIES_FOUND FALSE) +# -------------------------------------------------------------------------------------------------------- +# Include directories +# -------------------------------------------------------------------------------------------------------- + +target_include_directories(${PROJECT_NAME} INTERFACE "include") + +# -------------------------------------------------------------------------------------------------------- +# Setup Dependencies +# -------------------------------------------------------------------------------------------------------- + +include("cmake/cpm.cmake") + +CPMAddPackage( + NAME ViennaHRLE + GIT_TAG master + GIT_REPOSITORY "https://github.com/ViennaTools/ViennaHRLE" +) + +find_package(OpenMP REQUIRED) +target_link_libraries(${PROJECT_NAME} INTERFACE OpenMP::OpenMP_CXX ViennaHRLE) + +if (VIENNALS_USE_VTK) + CPMAddPackage( + NAME VTK + VERSION 9.3.0 + GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk" + OPTIONS "VTK_LEGACY_REMOVE ON" + "VTK_SMP_IMPLEMENTATION_TYPE \"OpenMP\"" + "VTK_MODULE_ENABLE_VTK_CommonExecutionModel YES" + "VTK_MODULE_ENABLE_VTK_CommonMisc YES" + "VTK_MODULE_ENABLE_VTK_CommonSystem YES" + "VTK_MODULE_ENABLE_VTK_CommonMath YES" + "VTK_MODULE_ENABLE_VTK_CommonCore YES" + "VTK_MODULE_ENABLE_VTK_CommonTransforms YES" + "VTK_MODULE_ENABLE_VTK_CommonComputationalGeometry YES" + "VTK_MODULE_ENABLE_VTK_IOCore YES" + "VTK_MODULE_ENABLE_VTK_IOXMLParser YES" + "VTK_MODULE_ENABLE_VTK_IOXML YES" + "VTK_MODULE_ENABLE_VTK_FiltersCore YES" + "VTK_MODULE_ENABLE_VTK_FiltersGeneral YES" + "VTK_MODULE_ENABLE_VTK_FiltersGeometry YES" + ) + + target_compile_definitions(${PROJECT_NAME} INTERFACE VIENNALS_USE_VTK=1) + + target_link_libraries(${PROJECT_NAME} INTERFACE + VTK::CommonExecutionModel + VTK::CommonMisc + VTK::CommonSystem + VTK::CommonMath + VTK::CommonCore + VTK::CommonTransforms + VTK::CommonComputationalGeometry + VTK::IOCore + VTK::IOXMLParser + VTK::IOXML + VTK::FiltersCore + VTK::FiltersGeneral + VTK::FiltersGeometry + ) + + if (NOT VTK_DIR) + set(VTK_DIR "${VTK_BINARY_DIR}/lib") endif() endif() -if(DEPENDENCIES_FOUND) - # Remove the buildDependencies target from the ALL target to prevent unnecessary re-builds - set_target_properties(buildDependencies PROPERTIES EXCLUDE_FROM_ALL true) -else() - message(WARNING "Not all dependencies were found. Execute buildDependencies target first.") - # Add the buildDependencies target to the ALL target - set_target_properties(buildDependencies PROPERTIES EXCLUDE_FROM_ALL false) -endif() +# -------------------------------------------------------------------------------------------------------- +# Setup Shared/Static Library +# -------------------------------------------------------------------------------------------------------- -# ################################################################################################## -# BUILD PRECOMPILED HEADER LIBRARIES -# ################################################################################################## -if(VIENNALS_PRECOMPILE_HEADERS AND DEPENDENCIES_FOUND) - # Add all specialisation source files - file(GLOB SPECIALISATION_CPPS "lib/*.cpp") - - # Decide wheter to build the precompiled headers as a static or shared library - if(VIENNALS_STATIC_BUILD) - add_library(${PROJECT_NAME} STATIC ${SPECIALISATION_CPPS}) - - # Find paths to all static library targets - foreach(_lib ${VIENNALS_LIBRARIES}) - if(TARGET ${_lib}) - get_target_property(_target_type ${_lib} TYPE) - # message(STATUS "${_lib} ${_target_type}") - if(_target_type STREQUAL "STATIC_LIBRARY") - list(APPEND static_lib_files $) - elseif(_target_type STREQUAL "SHARED_LIBRARY") - message( - FATAL_ERROR "Not all required libraries can be statically linked!\n- Caused by ${_lib}") - endif() - endif() - endforeach() - - if(CMAKE_CXX_COMPILER_ID MATCHES "^(Clang|GNU)$") - # Create an archiver (ar) script that bundles all static library dependencies into one bundled - # static library - set(AR_FILE_CONTENT - "CREATE ${CMAKE_BINARY_DIR}/libViennaLS.a\nADDLIB ${CMAKE_BINARY_DIR}/libViennaLS.a") - foreach(_statlib ${static_lib_files}) - set(AR_FILE_CONTENT "${AR_FILE_CONTENT}\nADDLIB ${_statlib}") - endforeach() - set(AR_FILE_CONTENT "${AR_FILE_CONTENT}\nSAVE\nEND\n") - - file( - GENERATE - OUTPUT "${CMAKE_BINARY_DIR}/bundle.ar" - CONTENT "${AR_FILE_CONTENT}") - - # Execute the archiver script after the target has been built - add_custom_command( - TARGET ${PROJECT_NAME} - POST_BUILD - COMMAND ${CMAKE_AR} -M < ${CMAKE_BINARY_DIR}/bundle.ar - COMMENT "Bundling all static libraries into one." - VERBATIM) - elseif(CMAKE_CXX_COMPILER_ID MATCHES "^(AppleClang)$") - find_program(libtool_bin libtool) - - # TODO: check if libtool found - - add_custom_command( - TARGET ${PROJECT_NAME} - POST_BUILD - COMMAND ${libtool_bin} -static -o libViennaLS.a ${CMAKE_BINARY_DIR}/libViennaLS.a - ${static_lib_files} - COMMENT "Bundling all static libraries into one." - VERBATIM) - else() - message( - FATAL_ERROR - "Building a static version of ${PROJECT_NAME} is currently not supported with the selected build tools." - ) - endif() - else() - # Shared library - add_library(${PROJECT_NAME} SHARED ${SPECIALISATION_CPPS}) - endif() +if (VIENNALS_PRECOMPILE_HEADERS) + set(VIENNALS_LINKAGE SHARED) - target_link_libraries(${PROJECT_NAME} ${VIENNALS_LIBRARIES}) - # Include the project header files and ViennaHRLE - target_include_directories(${PROJECT_NAME} PRIVATE "${PROJECT_SOURCE_DIR}/include/" - ${VIENNAHRLE_INCLUDE_DIRS}) - # Also include VTK if we enabled VTK support (with VTK 9+ this is done automatically when we link - # the vtk targets - the VTK_INCLUDE_DIRS variable is empty in that case) - if(VIENNALS_USE_VTK) - target_include_directories(${PROJECT_NAME} PRIVATE ${VTK_INCLUDE_DIRS}) + if (VIENNALS_STATIC_BUILD) + set(VIENNALS_LINKAGE STATIC) endif() - set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${PROJECT_VERSION}) -else() - # By default, create header only library - add_library(${PROJECT_NAME} INTERFACE) + + add_library(${PROJECT_NAME}Lib ${VIENNALS_LINKAGE}) + add_library(${PROJECT_NAME}::Lib ALIAS ${PROJECT_NAME}Lib) + + target_link_libraries(${PROJECT_NAME}Lib PUBLIC ${PROJECT_NAME}) + target_sources(${PROJECT_NAME}Lib PUBLIC "lib/specialisations.cpp") endif() -# ################################################################################################## -# DIRECTORY CONFIGURATIONS -# ################################################################################################## -if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) - set(CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/${PROJECT_NAME}/") +# -------------------------------------------------------------------------------------------------------- +# Setup Python Bindings +# -------------------------------------------------------------------------------------------------------- + +if (VIENNALS_BUILD_PYTHON) + add_subdirectory(Python) endif() -set(LOCAL_CONFIG_DIR "lib/cmake/${PROJECT_NAME}") - -# This variable is used by the example, test, python and precompiled library target, since those are -# compiled before the project is installed in its proper install location. -set(VIENNALS_BUILD_INCLUDE_DIRS "${${PROJECT_NAME}_SOURCE_DIR}/include") - -# Adding the install interface generator expression makes sure that the include files are installed -# to the proper location (provided by GNUInstallDirs) -target_include_directories( - ${PROJECT_NAME} INTERFACE $ - $) -target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_11) - -# ################################################################################################## -# CMAKE CONFIG FILE SETUP -# ################################################################################################## -include(CMakePackageConfigHelpers) -write_basic_package_version_file( - "${PROJECT_NAME}ConfigVersion.cmake" - VERSION ${PROJECT_VERSION} - COMPATIBILITY AnyNewerVersion) - -configure_package_config_file( - "${PROJECT_SOURCE_DIR}/cmake/${PROJECT_NAME}Config.cmake.in" - "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" INSTALL_DESTINATION ${LOCAL_CONFIG_DIR}) - -# ################################################################################################## -# BUILD EXAMPLES -# ################################################################################################## -if(VIENNALS_BUILD_EXAMPLES AND DEPENDENCIES_FOUND) + +# -------------------------------------------------------------------------------------------------------- +# Setup Examples +# -------------------------------------------------------------------------------------------------------- + +if (VIENNALS_BUILD_EXAMPLES) add_subdirectory(Examples) endif() -# ################################################################################################## -# BUILD TESTS (Smaller examples for testing) -# ################################################################################################## -if(VIENNALS_BUILD_TESTS AND DEPENDENCIES_FOUND) +# -------------------------------------------------------------------------------------------------------- +# Setup Tests +# -------------------------------------------------------------------------------------------------------- + +if (VIENNALS_BUILD_TESTS) enable_testing() add_subdirectory(Tests) endif() - -# ################################################################################################## -# BUILD PYTHON MODULE -# ################################################################################################## -if(VIENNALS_BUILD_PYTHON AND DEPENDENCIES_FOUND) - add_subdirectory(Python) -endif() - -# ################################################################################################## -# INSTALL -# ################################################################################################## -install( - TARGETS ${PROJECT_NAME} - EXPORT ${PROJECT_NAME}_Targets - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - -install( - EXPORT ${PROJECT_NAME}_Targets - FILE ${PROJECT_NAME}Targets.cmake - DESTINATION ${LOCAL_CONFIG_DIR}) - -install(FILES "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" - "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake" - DESTINATION ${LOCAL_CONFIG_DIR}) - -# Install include files -file(GLOB_RECURSE HEADER_FILES "${PROJECT_SOURCE_DIR}/include/*.hpp") -install(FILES ${HEADER_FILES} DESTINATION include) diff --git a/cmake/ViennaLSConfig.cmake.in b/cmake/ViennaLSConfig.cmake.in deleted file mode 100644 index dba07ffc..00000000 --- a/cmake/ViennaLSConfig.cmake.in +++ /dev/null @@ -1,73 +0,0 @@ -@PACKAGE_INIT@ - -include(CMakeFindDependencyMacro) - -# ViennaLS requires C++17 -set(CMAKE_CXX_STANDARD "17") - -# ################################################################################################## -# compiler dependent settings for ViennaLS -# ################################################################################################## -find_dependency(OpenMP) -list(APPEND VIENNALS_LIBRARIES OpenMP::OpenMP_CXX) - -# compiler dependent settings -if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - # disable-new-dtags sets RPATH which searches for libs recursively, instead of RUNPATH which is - # not needed for g++ to link correctly - set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--disable-new-dtags") -elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") - # SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp /wd\"4267\" /wd\"4244\"") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd\"4267\" /wd\"4244\"") -endif() - -set(VIENNALS_INCLUDE_DIRS "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@") - -set(ViennaHRLE_DIR @ViennaHRLE_DIR@) - -find_dependency(ViennaHRLE PATHS ${ViennaHRLE_DIR} NO_DEFAULT_PATH) -list(APPEND VIENNALS_INCLUDE_DIRS ${VIENNAHRLE_INCLUDE_DIRS}) - -set(VIENNALS_USE_VTK @VIENNALS_USE_VTK@) -if(@VIENNALS_USE_VTK@) - set(VTK_DIR @VTK_DIR@) - - # If VIENNALS_USE_VTK is set to true, we expect vtk to be found. Otherwise throw an error. - # NO_DEFAULT_PATH ensures that the path is stored in cmake cache and consecutive find_dependency - # calls don't overwrite its value. - find_dependency( - VTK - CONFIG - PATHS - ${VTK_DIR} - COMPONENTS - @VTK_COMPONENTS@ - NO_DEFAULT_PATH) - - add_compile_definitions(VIENNALS_USE_VTK) - - # use VTK_USE_FILE for older versions of VTK - if(VTK_VERSION VERSION_LESS "9.0") - message(STATUS "Using old VTK Version: ${VTK_VERSION}") - include(${VTK_USE_FILE}) - endif() - - set(VTK_LIBRARIES @VTK_LIBRARIES@) - - list(APPEND VIENNALS_LIBRARIES ${VTK_LIBRARIES}) -endif() - -if(@VIENNALS_PRECOMPILE_HEADERS@) - option(VIENNALS_USE_PRECOMPILED "Use precompiled headers" ON) - if(VIENNALS_USE_PRECOMPILED) - add_definitions(-DVIENNALS_USE_PRECOMPILED) - link_directories(@CMAKE_INSTALL_PREFIX@/lib) - list(APPEND VIENNALS_LIBRARIES @PROJECT_NAME@) - endif() -endif() - -if(@VIENNALS_STATIC_BUILD@) - set(VIENNALS_STATIC_BUILD ON) -endif() - -check_required_components("@PROJECT_NAME@") diff --git a/cmake/cpm.cmake b/cmake/cpm.cmake new file mode 100644 index 00000000..7ffb16b6 --- /dev/null +++ b/cmake/cpm.cmake @@ -0,0 +1,1155 @@ +# CPM.cmake - CMake's missing package manager +# =========================================== +# See https://github.com/cpm-cmake/CPM.cmake for usage and update instructions. +# +# MIT License +# ----------- +#[[ + Copyright (c) 2019-2023 Lars Melchior and contributors + + Permission is hereby granted, free of charge, to any person obtaining a copy + of this software and associated documentation files (the "Software"), to deal + in the Software without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + copies of the Software, and to permit persons to whom the Software is + furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included in all + copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. +]] + +cmake_minimum_required(VERSION 3.14 FATAL_ERROR) + +# Initialize logging prefix +if(NOT CPM_INDENT) + set(CPM_INDENT + "CPM:" + CACHE INTERNAL "" + ) +endif() + +if(NOT COMMAND cpm_message) + function(cpm_message) + message(${ARGV}) + endfunction() +endif() + +set(CURRENT_CPM_VERSION 0.38.6) + +get_filename_component(CPM_CURRENT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" REALPATH) +if(CPM_DIRECTORY) + if(NOT CPM_DIRECTORY STREQUAL CPM_CURRENT_DIRECTORY) + if(CPM_VERSION VERSION_LESS CURRENT_CPM_VERSION) + message( + AUTHOR_WARNING + "${CPM_INDENT} \ +A dependency is using a more recent CPM version (${CURRENT_CPM_VERSION}) than the current project (${CPM_VERSION}). \ +It is recommended to upgrade CPM to the most recent version. \ +See https://github.com/cpm-cmake/CPM.cmake for more information." + ) + endif() + if(${CMAKE_VERSION} VERSION_LESS "3.17.0") + include(FetchContent) + endif() + return() + endif() + + get_property( + CPM_INITIALIZED GLOBAL "" + PROPERTY CPM_INITIALIZED + SET + ) + if(CPM_INITIALIZED) + return() + endif() +endif() + +if(CURRENT_CPM_VERSION MATCHES "development-version") + message( + WARNING "${CPM_INDENT} Your project is using an unstable development version of CPM.cmake. \ +Please update to a recent release if possible. \ +See https://github.com/cpm-cmake/CPM.cmake for details." + ) +endif() + +set_property(GLOBAL PROPERTY CPM_INITIALIZED true) + +macro(cpm_set_policies) + # the policy allows us to change options without caching + cmake_policy(SET CMP0077 NEW) + set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) + + # the policy allows us to change set(CACHE) without caching + if(POLICY CMP0126) + cmake_policy(SET CMP0126 NEW) + set(CMAKE_POLICY_DEFAULT_CMP0126 NEW) + endif() + + # The policy uses the download time for timestamp, instead of the timestamp in the archive. This + # allows for proper rebuilds when a projects url changes + if(POLICY CMP0135) + cmake_policy(SET CMP0135 NEW) + set(CMAKE_POLICY_DEFAULT_CMP0135 NEW) + endif() +endmacro() +cpm_set_policies() + +option(CPM_USE_LOCAL_PACKAGES "Always try to use `find_package` to get dependencies" + $ENV{CPM_USE_LOCAL_PACKAGES} +) +option(CPM_LOCAL_PACKAGES_ONLY "Only use `find_package` to get dependencies" + $ENV{CPM_LOCAL_PACKAGES_ONLY} +) +option(CPM_DOWNLOAD_ALL "Always download dependencies from source" $ENV{CPM_DOWNLOAD_ALL}) +option(CPM_DONT_UPDATE_MODULE_PATH "Don't update the module path to allow using find_package" + $ENV{CPM_DONT_UPDATE_MODULE_PATH} +) +option(CPM_DONT_CREATE_PACKAGE_LOCK "Don't create a package lock file in the binary path" + $ENV{CPM_DONT_CREATE_PACKAGE_LOCK} +) +option(CPM_INCLUDE_ALL_IN_PACKAGE_LOCK + "Add all packages added through CPM.cmake to the package lock" + $ENV{CPM_INCLUDE_ALL_IN_PACKAGE_LOCK} +) +option(CPM_USE_NAMED_CACHE_DIRECTORIES + "Use additional directory of package name in cache on the most nested level." + $ENV{CPM_USE_NAMED_CACHE_DIRECTORIES} +) + +set(CPM_VERSION + ${CURRENT_CPM_VERSION} + CACHE INTERNAL "" +) +set(CPM_DIRECTORY + ${CPM_CURRENT_DIRECTORY} + CACHE INTERNAL "" +) +set(CPM_FILE + ${CMAKE_CURRENT_LIST_FILE} + CACHE INTERNAL "" +) +set(CPM_PACKAGES + "" + CACHE INTERNAL "" +) +set(CPM_DRY_RUN + OFF + CACHE INTERNAL "Don't download or configure dependencies (for testing)" +) + +if(DEFINED ENV{CPM_SOURCE_CACHE}) + set(CPM_SOURCE_CACHE_DEFAULT $ENV{CPM_SOURCE_CACHE}) +else() + set(CPM_SOURCE_CACHE_DEFAULT OFF) +endif() + +set(CPM_SOURCE_CACHE + ${CPM_SOURCE_CACHE_DEFAULT} + CACHE PATH "Directory to download CPM dependencies" +) + +if(NOT CPM_DONT_UPDATE_MODULE_PATH) + set(CPM_MODULE_PATH + "${CMAKE_BINARY_DIR}/CPM_modules" + CACHE INTERNAL "" + ) + # remove old modules + file(REMOVE_RECURSE ${CPM_MODULE_PATH}) + file(MAKE_DIRECTORY ${CPM_MODULE_PATH}) + # locally added CPM modules should override global packages + set(CMAKE_MODULE_PATH "${CPM_MODULE_PATH};${CMAKE_MODULE_PATH}") +endif() + +if(NOT CPM_DONT_CREATE_PACKAGE_LOCK) + set(CPM_PACKAGE_LOCK_FILE + "${CMAKE_BINARY_DIR}/cpm-package-lock.cmake" + CACHE INTERNAL "" + ) + file(WRITE ${CPM_PACKAGE_LOCK_FILE} + "# CPM Package Lock\n# This file should be committed to version control\n\n" + ) +endif() + +include(FetchContent) + +# Try to infer package name from git repository uri (path or url) +function(cpm_package_name_from_git_uri URI RESULT) + if("${URI}" MATCHES "([^/:]+)/?.git/?$") + set(${RESULT} + ${CMAKE_MATCH_1} + PARENT_SCOPE + ) + else() + unset(${RESULT} PARENT_SCOPE) + endif() +endfunction() + +# Try to infer package name and version from a url +function(cpm_package_name_and_ver_from_url url outName outVer) + if(url MATCHES "[/\\?]([a-zA-Z0-9_\\.-]+)\\.(tar|tar\\.gz|tar\\.bz2|zip|ZIP)(\\?|/|$)") + # We matched an archive + set(filename "${CMAKE_MATCH_1}") + + if(filename MATCHES "([a-zA-Z0-9_\\.-]+)[_-]v?(([0-9]+\\.)*[0-9]+[a-zA-Z0-9]*)") + # We matched - (ie foo-1.2.3) + set(${outName} + "${CMAKE_MATCH_1}" + PARENT_SCOPE + ) + set(${outVer} + "${CMAKE_MATCH_2}" + PARENT_SCOPE + ) + elseif(filename MATCHES "(([0-9]+\\.)+[0-9]+[a-zA-Z0-9]*)") + # We couldn't find a name, but we found a version + # + # In many cases (which we don't handle here) the url would look something like + # `irrelevant/ACTUAL_PACKAGE_NAME/irrelevant/1.2.3.zip`. In such a case we can't possibly + # distinguish the package name from the irrelevant bits. Moreover if we try to match the + # package name from the filename, we'd get bogus at best. + unset(${outName} PARENT_SCOPE) + set(${outVer} + "${CMAKE_MATCH_1}" + PARENT_SCOPE + ) + else() + # Boldly assume that the file name is the package name. + # + # Yes, something like `irrelevant/ACTUAL_NAME/irrelevant/download.zip` will ruin our day, but + # such cases should be quite rare. No popular service does this... we think. + set(${outName} + "${filename}" + PARENT_SCOPE + ) + unset(${outVer} PARENT_SCOPE) + endif() + else() + # No ideas yet what to do with non-archives + unset(${outName} PARENT_SCOPE) + unset(${outVer} PARENT_SCOPE) + endif() +endfunction() + +function(cpm_find_package NAME VERSION) + string(REPLACE " " ";" EXTRA_ARGS "${ARGN}") + find_package(${NAME} ${VERSION} ${EXTRA_ARGS} QUIET) + if(${CPM_ARGS_NAME}_FOUND) + if(DEFINED ${CPM_ARGS_NAME}_VERSION) + set(VERSION ${${CPM_ARGS_NAME}_VERSION}) + endif() + cpm_message(STATUS "${CPM_INDENT} Using local package ${CPM_ARGS_NAME}@${VERSION}") + CPMRegisterPackage(${CPM_ARGS_NAME} "${VERSION}") + set(CPM_PACKAGE_FOUND + YES + PARENT_SCOPE + ) + else() + set(CPM_PACKAGE_FOUND + NO + PARENT_SCOPE + ) + endif() +endfunction() + +# Create a custom FindXXX.cmake module for a CPM package This prevents `find_package(NAME)` from +# finding the system library +function(cpm_create_module_file Name) + if(NOT CPM_DONT_UPDATE_MODULE_PATH) + # erase any previous modules + file(WRITE ${CPM_MODULE_PATH}/Find${Name}.cmake + "include(\"${CPM_FILE}\")\n${ARGN}\nset(${Name}_FOUND TRUE)" + ) + endif() +endfunction() + +# Find a package locally or fallback to CPMAddPackage +function(CPMFindPackage) + set(oneValueArgs NAME VERSION GIT_TAG FIND_PACKAGE_ARGUMENTS) + + cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "" ${ARGN}) + + if(NOT DEFINED CPM_ARGS_VERSION) + if(DEFINED CPM_ARGS_GIT_TAG) + cpm_get_version_from_git_tag("${CPM_ARGS_GIT_TAG}" CPM_ARGS_VERSION) + endif() + endif() + + set(downloadPackage ${CPM_DOWNLOAD_ALL}) + if(DEFINED CPM_DOWNLOAD_${CPM_ARGS_NAME}) + set(downloadPackage ${CPM_DOWNLOAD_${CPM_ARGS_NAME}}) + elseif(DEFINED ENV{CPM_DOWNLOAD_${CPM_ARGS_NAME}}) + set(downloadPackage $ENV{CPM_DOWNLOAD_${CPM_ARGS_NAME}}) + endif() + if(downloadPackage) + CPMAddPackage(${ARGN}) + cpm_export_variables(${CPM_ARGS_NAME}) + return() + endif() + + cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}") + if(CPM_PACKAGE_ALREADY_ADDED) + cpm_export_variables(${CPM_ARGS_NAME}) + return() + endif() + + cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS}) + + if(NOT CPM_PACKAGE_FOUND) + CPMAddPackage(${ARGN}) + cpm_export_variables(${CPM_ARGS_NAME}) + endif() + +endfunction() + +# checks if a package has been added before +function(cpm_check_if_package_already_added CPM_ARGS_NAME CPM_ARGS_VERSION) + if("${CPM_ARGS_NAME}" IN_LIST CPM_PACKAGES) + CPMGetPackageVersion(${CPM_ARGS_NAME} CPM_PACKAGE_VERSION) + if("${CPM_PACKAGE_VERSION}" VERSION_LESS "${CPM_ARGS_VERSION}") + message( + WARNING + "${CPM_INDENT} Requires a newer version of ${CPM_ARGS_NAME} (${CPM_ARGS_VERSION}) than currently included (${CPM_PACKAGE_VERSION})." + ) + endif() + cpm_get_fetch_properties(${CPM_ARGS_NAME}) + set(${CPM_ARGS_NAME}_ADDED NO) + set(CPM_PACKAGE_ALREADY_ADDED + YES + PARENT_SCOPE + ) + cpm_export_variables(${CPM_ARGS_NAME}) + else() + set(CPM_PACKAGE_ALREADY_ADDED + NO + PARENT_SCOPE + ) + endif() +endfunction() + +# Parse the argument of CPMAddPackage in case a single one was provided and convert it to a list of +# arguments which can then be parsed idiomatically. For example gh:foo/bar@1.2.3 will be converted +# to: GITHUB_REPOSITORY;foo/bar;VERSION;1.2.3 +function(cpm_parse_add_package_single_arg arg outArgs) + # Look for a scheme + if("${arg}" MATCHES "^([a-zA-Z]+):(.+)$") + string(TOLOWER "${CMAKE_MATCH_1}" scheme) + set(uri "${CMAKE_MATCH_2}") + + # Check for CPM-specific schemes + if(scheme STREQUAL "gh") + set(out "GITHUB_REPOSITORY;${uri}") + set(packageType "git") + elseif(scheme STREQUAL "gl") + set(out "GITLAB_REPOSITORY;${uri}") + set(packageType "git") + elseif(scheme STREQUAL "bb") + set(out "BITBUCKET_REPOSITORY;${uri}") + set(packageType "git") + # A CPM-specific scheme was not found. Looks like this is a generic URL so try to determine + # type + elseif(arg MATCHES ".git/?(@|#|$)") + set(out "GIT_REPOSITORY;${arg}") + set(packageType "git") + else() + # Fall back to a URL + set(out "URL;${arg}") + set(packageType "archive") + + # We could also check for SVN since FetchContent supports it, but SVN is so rare these days. + # We just won't bother with the additional complexity it will induce in this function. SVN is + # done by multi-arg + endif() + else() + if(arg MATCHES ".git/?(@|#|$)") + set(out "GIT_REPOSITORY;${arg}") + set(packageType "git") + else() + # Give up + message(FATAL_ERROR "${CPM_INDENT} Can't determine package type of '${arg}'") + endif() + endif() + + # For all packages we interpret @... as version. Only replace the last occurrence. Thus URIs + # containing '@' can be used + string(REGEX REPLACE "@([^@]+)$" ";VERSION;\\1" out "${out}") + + # Parse the rest according to package type + if(packageType STREQUAL "git") + # For git repos we interpret #... as a tag or branch or commit hash + string(REGEX REPLACE "#([^#]+)$" ";GIT_TAG;\\1" out "${out}") + elseif(packageType STREQUAL "archive") + # For archives we interpret #... as a URL hash. + string(REGEX REPLACE "#([^#]+)$" ";URL_HASH;\\1" out "${out}") + # We don't try to parse the version if it's not provided explicitly. cpm_get_version_from_url + # should do this at a later point + else() + # We should never get here. This is an assertion and hitting it means there's a bug in the code + # above. A packageType was set, but not handled by this if-else. + message(FATAL_ERROR "${CPM_INDENT} Unsupported package type '${packageType}' of '${arg}'") + endif() + + set(${outArgs} + ${out} + PARENT_SCOPE + ) +endfunction() + +# Check that the working directory for a git repo is clean +function(cpm_check_git_working_dir_is_clean repoPath gitTag isClean) + + find_package(Git REQUIRED) + + if(NOT GIT_EXECUTABLE) + # No git executable, assume directory is clean + set(${isClean} + TRUE + PARENT_SCOPE + ) + return() + endif() + + # check for uncommitted changes + execute_process( + COMMAND ${GIT_EXECUTABLE} status --porcelain + RESULT_VARIABLE resultGitStatus + OUTPUT_VARIABLE repoStatus + OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET + WORKING_DIRECTORY ${repoPath} + ) + if(resultGitStatus) + # not supposed to happen, assume clean anyway + message(WARNING "${CPM_INDENT} Calling git status on folder ${repoPath} failed") + set(${isClean} + TRUE + PARENT_SCOPE + ) + return() + endif() + + if(NOT "${repoStatus}" STREQUAL "") + set(${isClean} + FALSE + PARENT_SCOPE + ) + return() + endif() + + # check for committed changes + execute_process( + COMMAND ${GIT_EXECUTABLE} diff -s --exit-code ${gitTag} + RESULT_VARIABLE resultGitDiff + OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_QUIET + WORKING_DIRECTORY ${repoPath} + ) + + if(${resultGitDiff} EQUAL 0) + set(${isClean} + TRUE + PARENT_SCOPE + ) + else() + set(${isClean} + FALSE + PARENT_SCOPE + ) + endif() + +endfunction() + +# method to overwrite internal FetchContent properties, to allow using CPM.cmake to overload +# FetchContent calls. As these are internal cmake properties, this method should be used carefully +# and may need modification in future CMake versions. Source: +# https://github.com/Kitware/CMake/blob/dc3d0b5a0a7d26d43d6cfeb511e224533b5d188f/Modules/FetchContent.cmake#L1152 +function(cpm_override_fetchcontent contentName) + cmake_parse_arguments(PARSE_ARGV 1 arg "" "SOURCE_DIR;BINARY_DIR" "") + if(NOT "${arg_UNPARSED_ARGUMENTS}" STREQUAL "") + message(FATAL_ERROR "${CPM_INDENT} Unsupported arguments: ${arg_UNPARSED_ARGUMENTS}") + endif() + + string(TOLOWER ${contentName} contentNameLower) + set(prefix "_FetchContent_${contentNameLower}") + + set(propertyName "${prefix}_sourceDir") + define_property( + GLOBAL + PROPERTY ${propertyName} + BRIEF_DOCS "Internal implementation detail of FetchContent_Populate()" + FULL_DOCS "Details used by FetchContent_Populate() for ${contentName}" + ) + set_property(GLOBAL PROPERTY ${propertyName} "${arg_SOURCE_DIR}") + + set(propertyName "${prefix}_binaryDir") + define_property( + GLOBAL + PROPERTY ${propertyName} + BRIEF_DOCS "Internal implementation detail of FetchContent_Populate()" + FULL_DOCS "Details used by FetchContent_Populate() for ${contentName}" + ) + set_property(GLOBAL PROPERTY ${propertyName} "${arg_BINARY_DIR}") + + set(propertyName "${prefix}_populated") + define_property( + GLOBAL + PROPERTY ${propertyName} + BRIEF_DOCS "Internal implementation detail of FetchContent_Populate()" + FULL_DOCS "Details used by FetchContent_Populate() for ${contentName}" + ) + set_property(GLOBAL PROPERTY ${propertyName} TRUE) +endfunction() + +# Download and add a package from source +function(CPMAddPackage) + cpm_set_policies() + + list(LENGTH ARGN argnLength) + if(argnLength EQUAL 1) + cpm_parse_add_package_single_arg("${ARGN}" ARGN) + + # The shorthand syntax implies EXCLUDE_FROM_ALL and SYSTEM + set(ARGN "${ARGN};EXCLUDE_FROM_ALL;YES;SYSTEM;YES;") + endif() + + set(oneValueArgs + NAME + FORCE + VERSION + GIT_TAG + DOWNLOAD_ONLY + GITHUB_REPOSITORY + GITLAB_REPOSITORY + BITBUCKET_REPOSITORY + GIT_REPOSITORY + SOURCE_DIR + FIND_PACKAGE_ARGUMENTS + NO_CACHE + SYSTEM + GIT_SHALLOW + EXCLUDE_FROM_ALL + SOURCE_SUBDIR + ) + + set(multiValueArgs URL OPTIONS DOWNLOAD_COMMAND) + + cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}") + + # Set default values for arguments + + if(NOT DEFINED CPM_ARGS_VERSION) + if(DEFINED CPM_ARGS_GIT_TAG) + cpm_get_version_from_git_tag("${CPM_ARGS_GIT_TAG}" CPM_ARGS_VERSION) + endif() + endif() + + if(CPM_ARGS_DOWNLOAD_ONLY) + set(DOWNLOAD_ONLY ${CPM_ARGS_DOWNLOAD_ONLY}) + else() + set(DOWNLOAD_ONLY NO) + endif() + + if(DEFINED CPM_ARGS_GITHUB_REPOSITORY) + set(CPM_ARGS_GIT_REPOSITORY "https://github.com/${CPM_ARGS_GITHUB_REPOSITORY}.git") + elseif(DEFINED CPM_ARGS_GITLAB_REPOSITORY) + set(CPM_ARGS_GIT_REPOSITORY "https://gitlab.com/${CPM_ARGS_GITLAB_REPOSITORY}.git") + elseif(DEFINED CPM_ARGS_BITBUCKET_REPOSITORY) + set(CPM_ARGS_GIT_REPOSITORY "https://bitbucket.org/${CPM_ARGS_BITBUCKET_REPOSITORY}.git") + endif() + + if(DEFINED CPM_ARGS_GIT_REPOSITORY) + list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_REPOSITORY ${CPM_ARGS_GIT_REPOSITORY}) + if(NOT DEFINED CPM_ARGS_GIT_TAG) + set(CPM_ARGS_GIT_TAG v${CPM_ARGS_VERSION}) + endif() + + # If a name wasn't provided, try to infer it from the git repo + if(NOT DEFINED CPM_ARGS_NAME) + cpm_package_name_from_git_uri(${CPM_ARGS_GIT_REPOSITORY} CPM_ARGS_NAME) + endif() + endif() + + set(CPM_SKIP_FETCH FALSE) + + if(DEFINED CPM_ARGS_GIT_TAG) + list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_TAG ${CPM_ARGS_GIT_TAG}) + # If GIT_SHALLOW is explicitly specified, honor the value. + if(DEFINED CPM_ARGS_GIT_SHALLOW) + list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_SHALLOW ${CPM_ARGS_GIT_SHALLOW}) + endif() + endif() + + if(DEFINED CPM_ARGS_URL) + # If a name or version aren't provided, try to infer them from the URL + list(GET CPM_ARGS_URL 0 firstUrl) + cpm_package_name_and_ver_from_url(${firstUrl} nameFromUrl verFromUrl) + # If we fail to obtain name and version from the first URL, we could try other URLs if any. + # However multiple URLs are expected to be quite rare, so for now we won't bother. + + # If the caller provided their own name and version, they trump the inferred ones. + if(NOT DEFINED CPM_ARGS_NAME) + set(CPM_ARGS_NAME ${nameFromUrl}) + endif() + if(NOT DEFINED CPM_ARGS_VERSION) + set(CPM_ARGS_VERSION ${verFromUrl}) + endif() + + list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS URL "${CPM_ARGS_URL}") + endif() + + # Check for required arguments + + if(NOT DEFINED CPM_ARGS_NAME) + message( + FATAL_ERROR + "${CPM_INDENT} 'NAME' was not provided and couldn't be automatically inferred for package added with arguments: '${ARGN}'" + ) + endif() + + # Check if package has been added before + cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}") + if(CPM_PACKAGE_ALREADY_ADDED) + cpm_export_variables(${CPM_ARGS_NAME}) + return() + endif() + + # Check for manual overrides + if(NOT CPM_ARGS_FORCE AND NOT "${CPM_${CPM_ARGS_NAME}_SOURCE}" STREQUAL "") + set(PACKAGE_SOURCE ${CPM_${CPM_ARGS_NAME}_SOURCE}) + set(CPM_${CPM_ARGS_NAME}_SOURCE "") + CPMAddPackage( + NAME "${CPM_ARGS_NAME}" + SOURCE_DIR "${PACKAGE_SOURCE}" + EXCLUDE_FROM_ALL "${CPM_ARGS_EXCLUDE_FROM_ALL}" + SYSTEM "${CPM_ARGS_SYSTEM}" + OPTIONS "${CPM_ARGS_OPTIONS}" + SOURCE_SUBDIR "${CPM_ARGS_SOURCE_SUBDIR}" + DOWNLOAD_ONLY "${DOWNLOAD_ONLY}" + FORCE True + ) + cpm_export_variables(${CPM_ARGS_NAME}) + return() + endif() + + # Check for available declaration + if(NOT CPM_ARGS_FORCE AND NOT "${CPM_DECLARATION_${CPM_ARGS_NAME}}" STREQUAL "") + set(declaration ${CPM_DECLARATION_${CPM_ARGS_NAME}}) + set(CPM_DECLARATION_${CPM_ARGS_NAME} "") + CPMAddPackage(${declaration}) + cpm_export_variables(${CPM_ARGS_NAME}) + # checking again to ensure version and option compatibility + cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}") + return() + endif() + + if(NOT CPM_ARGS_FORCE) + if(CPM_USE_LOCAL_PACKAGES OR CPM_LOCAL_PACKAGES_ONLY) + cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS}) + + if(CPM_PACKAGE_FOUND) + cpm_export_variables(${CPM_ARGS_NAME}) + return() + endif() + + if(CPM_LOCAL_PACKAGES_ONLY) + message( + SEND_ERROR + "${CPM_INDENT} ${CPM_ARGS_NAME} not found via find_package(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION})" + ) + endif() + endif() + endif() + + CPMRegisterPackage("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}") + + if(DEFINED CPM_ARGS_GIT_TAG) + set(PACKAGE_INFO "${CPM_ARGS_GIT_TAG}") + elseif(DEFINED CPM_ARGS_SOURCE_DIR) + set(PACKAGE_INFO "${CPM_ARGS_SOURCE_DIR}") + else() + set(PACKAGE_INFO "${CPM_ARGS_VERSION}") + endif() + + if(DEFINED FETCHCONTENT_BASE_DIR) + # respect user's FETCHCONTENT_BASE_DIR if set + set(CPM_FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR}) + else() + set(CPM_FETCHCONTENT_BASE_DIR ${CMAKE_BINARY_DIR}/_deps) + endif() + + if(DEFINED CPM_ARGS_DOWNLOAD_COMMAND) + list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS DOWNLOAD_COMMAND ${CPM_ARGS_DOWNLOAD_COMMAND}) + elseif(DEFINED CPM_ARGS_SOURCE_DIR) + list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS SOURCE_DIR ${CPM_ARGS_SOURCE_DIR}) + if(NOT IS_ABSOLUTE ${CPM_ARGS_SOURCE_DIR}) + # Expand `CPM_ARGS_SOURCE_DIR` relative path. This is important because EXISTS doesn't work + # for relative paths. + get_filename_component( + source_directory ${CPM_ARGS_SOURCE_DIR} REALPATH BASE_DIR ${CMAKE_CURRENT_BINARY_DIR} + ) + else() + set(source_directory ${CPM_ARGS_SOURCE_DIR}) + endif() + if(NOT EXISTS ${source_directory}) + string(TOLOWER ${CPM_ARGS_NAME} lower_case_name) + # remove timestamps so CMake will re-download the dependency + file(REMOVE_RECURSE "${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-subbuild") + endif() + elseif(CPM_SOURCE_CACHE AND NOT CPM_ARGS_NO_CACHE) + string(TOLOWER ${CPM_ARGS_NAME} lower_case_name) + set(origin_parameters ${CPM_ARGS_UNPARSED_ARGUMENTS}) + list(SORT origin_parameters) + if(CPM_USE_NAMED_CACHE_DIRECTORIES) + string(SHA1 origin_hash "${origin_parameters};NEW_CACHE_STRUCTURE_TAG") + set(download_directory ${CPM_SOURCE_CACHE}/${lower_case_name}/${origin_hash}/${CPM_ARGS_NAME}) + else() + string(SHA1 origin_hash "${origin_parameters}") + set(download_directory ${CPM_SOURCE_CACHE}/${lower_case_name}/${origin_hash}) + endif() + # Expand `download_directory` relative path. This is important because EXISTS doesn't work for + # relative paths. + get_filename_component(download_directory ${download_directory} ABSOLUTE) + list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS SOURCE_DIR ${download_directory}) + + if(CPM_SOURCE_CACHE) + file(LOCK ${download_directory}/../cmake.lock) + endif() + + if(EXISTS ${download_directory}) + if(CPM_SOURCE_CACHE) + file(LOCK ${download_directory}/../cmake.lock RELEASE) + endif() + + cpm_store_fetch_properties( + ${CPM_ARGS_NAME} "${download_directory}" + "${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-build" + ) + cpm_get_fetch_properties("${CPM_ARGS_NAME}") + + if(DEFINED CPM_ARGS_GIT_TAG AND NOT (PATCH_COMMAND IN_LIST CPM_ARGS_UNPARSED_ARGUMENTS)) + # warn if cache has been changed since checkout + cpm_check_git_working_dir_is_clean(${download_directory} ${CPM_ARGS_GIT_TAG} IS_CLEAN) + if(NOT ${IS_CLEAN}) + message( + WARNING "${CPM_INDENT} Cache for ${CPM_ARGS_NAME} (${download_directory}) is dirty" + ) + endif() + endif() + + cpm_add_subdirectory( + "${CPM_ARGS_NAME}" + "${DOWNLOAD_ONLY}" + "${${CPM_ARGS_NAME}_SOURCE_DIR}/${CPM_ARGS_SOURCE_SUBDIR}" + "${${CPM_ARGS_NAME}_BINARY_DIR}" + "${CPM_ARGS_EXCLUDE_FROM_ALL}" + "${CPM_ARGS_SYSTEM}" + "${CPM_ARGS_OPTIONS}" + ) + set(PACKAGE_INFO "${PACKAGE_INFO} at ${download_directory}") + + # As the source dir is already cached/populated, we override the call to FetchContent. + set(CPM_SKIP_FETCH TRUE) + cpm_override_fetchcontent( + "${lower_case_name}" SOURCE_DIR "${${CPM_ARGS_NAME}_SOURCE_DIR}/${CPM_ARGS_SOURCE_SUBDIR}" + BINARY_DIR "${${CPM_ARGS_NAME}_BINARY_DIR}" + ) + + else() + # Enable shallow clone when GIT_TAG is not a commit hash. Our guess may not be accurate, but + # it should guarantee no commit hash get mis-detected. + if(NOT DEFINED CPM_ARGS_GIT_SHALLOW) + cpm_is_git_tag_commit_hash("${CPM_ARGS_GIT_TAG}" IS_HASH) + if(NOT ${IS_HASH}) + list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_SHALLOW TRUE) + endif() + endif() + + # remove timestamps so CMake will re-download the dependency + file(REMOVE_RECURSE ${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-subbuild) + set(PACKAGE_INFO "${PACKAGE_INFO} to ${download_directory}") + endif() + endif() + + cpm_create_module_file(${CPM_ARGS_NAME} "CPMAddPackage(\"${ARGN}\")") + + if(CPM_PACKAGE_LOCK_ENABLED) + if((CPM_ARGS_VERSION AND NOT CPM_ARGS_SOURCE_DIR) OR CPM_INCLUDE_ALL_IN_PACKAGE_LOCK) + cpm_add_to_package_lock(${CPM_ARGS_NAME} "${ARGN}") + elseif(CPM_ARGS_SOURCE_DIR) + cpm_add_comment_to_package_lock(${CPM_ARGS_NAME} "local directory") + else() + cpm_add_comment_to_package_lock(${CPM_ARGS_NAME} "${ARGN}") + endif() + endif() + + cpm_message( + STATUS "${CPM_INDENT} Adding package ${CPM_ARGS_NAME}@${CPM_ARGS_VERSION} (${PACKAGE_INFO})" + ) + + if(NOT CPM_SKIP_FETCH) + cpm_declare_fetch( + "${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}" "${PACKAGE_INFO}" "${CPM_ARGS_UNPARSED_ARGUMENTS}" + ) + cpm_fetch_package("${CPM_ARGS_NAME}" populated) + if(CPM_SOURCE_CACHE AND download_directory) + file(LOCK ${download_directory}/../cmake.lock RELEASE) + endif() + if(${populated}) + cpm_add_subdirectory( + "${CPM_ARGS_NAME}" + "${DOWNLOAD_ONLY}" + "${${CPM_ARGS_NAME}_SOURCE_DIR}/${CPM_ARGS_SOURCE_SUBDIR}" + "${${CPM_ARGS_NAME}_BINARY_DIR}" + "${CPM_ARGS_EXCLUDE_FROM_ALL}" + "${CPM_ARGS_SYSTEM}" + "${CPM_ARGS_OPTIONS}" + ) + endif() + cpm_get_fetch_properties("${CPM_ARGS_NAME}") + endif() + + set(${CPM_ARGS_NAME}_ADDED YES) + cpm_export_variables("${CPM_ARGS_NAME}") +endfunction() + +# Fetch a previously declared package +macro(CPMGetPackage Name) + if(DEFINED "CPM_DECLARATION_${Name}") + CPMAddPackage(NAME ${Name}) + else() + message(SEND_ERROR "${CPM_INDENT} Cannot retrieve package ${Name}: no declaration available") + endif() +endmacro() + +# export variables available to the caller to the parent scope expects ${CPM_ARGS_NAME} to be set +macro(cpm_export_variables name) + set(${name}_SOURCE_DIR + "${${name}_SOURCE_DIR}" + PARENT_SCOPE + ) + set(${name}_BINARY_DIR + "${${name}_BINARY_DIR}" + PARENT_SCOPE + ) + set(${name}_ADDED + "${${name}_ADDED}" + PARENT_SCOPE + ) + set(CPM_LAST_PACKAGE_NAME + "${name}" + PARENT_SCOPE + ) +endmacro() + +# declares a package, so that any call to CPMAddPackage for the package name will use these +# arguments instead. Previous declarations will not be overridden. +macro(CPMDeclarePackage Name) + if(NOT DEFINED "CPM_DECLARATION_${Name}") + set("CPM_DECLARATION_${Name}" "${ARGN}") + endif() +endmacro() + +function(cpm_add_to_package_lock Name) + if(NOT CPM_DONT_CREATE_PACKAGE_LOCK) + cpm_prettify_package_arguments(PRETTY_ARGN false ${ARGN}) + file(APPEND ${CPM_PACKAGE_LOCK_FILE} "# ${Name}\nCPMDeclarePackage(${Name}\n${PRETTY_ARGN})\n") + endif() +endfunction() + +function(cpm_add_comment_to_package_lock Name) + if(NOT CPM_DONT_CREATE_PACKAGE_LOCK) + cpm_prettify_package_arguments(PRETTY_ARGN true ${ARGN}) + file(APPEND ${CPM_PACKAGE_LOCK_FILE} + "# ${Name} (unversioned)\n# CPMDeclarePackage(${Name}\n${PRETTY_ARGN}#)\n" + ) + endif() +endfunction() + +# includes the package lock file if it exists and creates a target `cpm-update-package-lock` to +# update it +macro(CPMUsePackageLock file) + if(NOT CPM_DONT_CREATE_PACKAGE_LOCK) + get_filename_component(CPM_ABSOLUTE_PACKAGE_LOCK_PATH ${file} ABSOLUTE) + if(EXISTS ${CPM_ABSOLUTE_PACKAGE_LOCK_PATH}) + include(${CPM_ABSOLUTE_PACKAGE_LOCK_PATH}) + endif() + if(NOT TARGET cpm-update-package-lock) + add_custom_target( + cpm-update-package-lock COMMAND ${CMAKE_COMMAND} -E copy ${CPM_PACKAGE_LOCK_FILE} + ${CPM_ABSOLUTE_PACKAGE_LOCK_PATH} + ) + endif() + set(CPM_PACKAGE_LOCK_ENABLED true) + endif() +endmacro() + +# registers a package that has been added to CPM +function(CPMRegisterPackage PACKAGE VERSION) + list(APPEND CPM_PACKAGES ${PACKAGE}) + set(CPM_PACKAGES + ${CPM_PACKAGES} + CACHE INTERNAL "" + ) + set("CPM_PACKAGE_${PACKAGE}_VERSION" + ${VERSION} + CACHE INTERNAL "" + ) +endfunction() + +# retrieve the current version of the package to ${OUTPUT} +function(CPMGetPackageVersion PACKAGE OUTPUT) + set(${OUTPUT} + "${CPM_PACKAGE_${PACKAGE}_VERSION}" + PARENT_SCOPE + ) +endfunction() + +# declares a package in FetchContent_Declare +function(cpm_declare_fetch PACKAGE VERSION INFO) + if(${CPM_DRY_RUN}) + cpm_message(STATUS "${CPM_INDENT} Package not declared (dry run)") + return() + endif() + + FetchContent_Declare(${PACKAGE} ${ARGN}) +endfunction() + +# returns properties for a package previously defined by cpm_declare_fetch +function(cpm_get_fetch_properties PACKAGE) + if(${CPM_DRY_RUN}) + return() + endif() + + set(${PACKAGE}_SOURCE_DIR + "${CPM_PACKAGE_${PACKAGE}_SOURCE_DIR}" + PARENT_SCOPE + ) + set(${PACKAGE}_BINARY_DIR + "${CPM_PACKAGE_${PACKAGE}_BINARY_DIR}" + PARENT_SCOPE + ) +endfunction() + +function(cpm_store_fetch_properties PACKAGE source_dir binary_dir) + if(${CPM_DRY_RUN}) + return() + endif() + + set(CPM_PACKAGE_${PACKAGE}_SOURCE_DIR + "${source_dir}" + CACHE INTERNAL "" + ) + set(CPM_PACKAGE_${PACKAGE}_BINARY_DIR + "${binary_dir}" + CACHE INTERNAL "" + ) +endfunction() + +# adds a package as a subdirectory if viable, according to provided options +function( + cpm_add_subdirectory + PACKAGE + DOWNLOAD_ONLY + SOURCE_DIR + BINARY_DIR + EXCLUDE + SYSTEM + OPTIONS +) + + if(NOT DOWNLOAD_ONLY AND EXISTS ${SOURCE_DIR}/CMakeLists.txt) + set(addSubdirectoryExtraArgs "") + if(EXCLUDE) + list(APPEND addSubdirectoryExtraArgs EXCLUDE_FROM_ALL) + endif() + if("${SYSTEM}" AND "${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.25") + # https://cmake.org/cmake/help/latest/prop_dir/SYSTEM.html#prop_dir:SYSTEM + list(APPEND addSubdirectoryExtraArgs SYSTEM) + endif() + if(OPTIONS) + foreach(OPTION ${OPTIONS}) + cpm_parse_option("${OPTION}") + set(${OPTION_KEY} "${OPTION_VALUE}") + endforeach() + endif() + set(CPM_OLD_INDENT "${CPM_INDENT}") + set(CPM_INDENT "${CPM_INDENT} ${PACKAGE}:") + add_subdirectory(${SOURCE_DIR} ${BINARY_DIR} ${addSubdirectoryExtraArgs}) + set(CPM_INDENT "${CPM_OLD_INDENT}") + endif() +endfunction() + +# downloads a previously declared package via FetchContent and exports the variables +# `${PACKAGE}_SOURCE_DIR` and `${PACKAGE}_BINARY_DIR` to the parent scope +function(cpm_fetch_package PACKAGE populated) + set(${populated} + FALSE + PARENT_SCOPE + ) + if(${CPM_DRY_RUN}) + cpm_message(STATUS "${CPM_INDENT} Package ${PACKAGE} not fetched (dry run)") + return() + endif() + + FetchContent_GetProperties(${PACKAGE}) + + string(TOLOWER "${PACKAGE}" lower_case_name) + + if(NOT ${lower_case_name}_POPULATED) + FetchContent_Populate(${PACKAGE}) + set(${populated} + TRUE + PARENT_SCOPE + ) + endif() + + cpm_store_fetch_properties( + ${CPM_ARGS_NAME} ${${lower_case_name}_SOURCE_DIR} ${${lower_case_name}_BINARY_DIR} + ) + + set(${PACKAGE}_SOURCE_DIR + ${${lower_case_name}_SOURCE_DIR} + PARENT_SCOPE + ) + set(${PACKAGE}_BINARY_DIR + ${${lower_case_name}_BINARY_DIR} + PARENT_SCOPE + ) +endfunction() + +# splits a package option +function(cpm_parse_option OPTION) + string(REGEX MATCH "^[^ ]+" OPTION_KEY "${OPTION}") + string(LENGTH "${OPTION}" OPTION_LENGTH) + string(LENGTH "${OPTION_KEY}" OPTION_KEY_LENGTH) + if(OPTION_KEY_LENGTH STREQUAL OPTION_LENGTH) + # no value for key provided, assume user wants to set option to "ON" + set(OPTION_VALUE "ON") + else() + math(EXPR OPTION_KEY_LENGTH "${OPTION_KEY_LENGTH}+1") + string(SUBSTRING "${OPTION}" "${OPTION_KEY_LENGTH}" "-1" OPTION_VALUE) + endif() + set(OPTION_KEY + "${OPTION_KEY}" + PARENT_SCOPE + ) + set(OPTION_VALUE + "${OPTION_VALUE}" + PARENT_SCOPE + ) +endfunction() + +# guesses the package version from a git tag +function(cpm_get_version_from_git_tag GIT_TAG RESULT) + string(LENGTH ${GIT_TAG} length) + if(length EQUAL 40) + # GIT_TAG is probably a git hash + set(${RESULT} + 0 + PARENT_SCOPE + ) + else() + string(REGEX MATCH "v?([0123456789.]*).*" _ ${GIT_TAG}) + set(${RESULT} + ${CMAKE_MATCH_1} + PARENT_SCOPE + ) + endif() +endfunction() + +# guesses if the git tag is a commit hash or an actual tag or a branch name. +function(cpm_is_git_tag_commit_hash GIT_TAG RESULT) + string(LENGTH "${GIT_TAG}" length) + # full hash has 40 characters, and short hash has at least 7 characters. + if(length LESS 7 OR length GREATER 40) + set(${RESULT} + 0 + PARENT_SCOPE + ) + else() + if(${GIT_TAG} MATCHES "^[a-fA-F0-9]+$") + set(${RESULT} + 1 + PARENT_SCOPE + ) + else() + set(${RESULT} + 0 + PARENT_SCOPE + ) + endif() + endif() +endfunction() + +function(cpm_prettify_package_arguments OUT_VAR IS_IN_COMMENT) + set(oneValueArgs + NAME + FORCE + VERSION + GIT_TAG + DOWNLOAD_ONLY + GITHUB_REPOSITORY + GITLAB_REPOSITORY + BITBUCKET_REPOSITORY + GIT_REPOSITORY + SOURCE_DIR + FIND_PACKAGE_ARGUMENTS + NO_CACHE + SYSTEM + GIT_SHALLOW + EXCLUDE_FROM_ALL + SOURCE_SUBDIR + ) + set(multiValueArgs URL OPTIONS DOWNLOAD_COMMAND) + cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) + + foreach(oneArgName ${oneValueArgs}) + if(DEFINED CPM_ARGS_${oneArgName}) + if(${IS_IN_COMMENT}) + string(APPEND PRETTY_OUT_VAR "#") + endif() + if(${oneArgName} STREQUAL "SOURCE_DIR") + string(REPLACE ${CMAKE_SOURCE_DIR} "\${CMAKE_SOURCE_DIR}" CPM_ARGS_${oneArgName} + ${CPM_ARGS_${oneArgName}} + ) + endif() + string(APPEND PRETTY_OUT_VAR " ${oneArgName} ${CPM_ARGS_${oneArgName}}\n") + endif() + endforeach() + foreach(multiArgName ${multiValueArgs}) + if(DEFINED CPM_ARGS_${multiArgName}) + if(${IS_IN_COMMENT}) + string(APPEND PRETTY_OUT_VAR "#") + endif() + string(APPEND PRETTY_OUT_VAR " ${multiArgName}\n") + foreach(singleOption ${CPM_ARGS_${multiArgName}}) + if(${IS_IN_COMMENT}) + string(APPEND PRETTY_OUT_VAR "#") + endif() + string(APPEND PRETTY_OUT_VAR " \"${singleOption}\"\n") + endforeach() + endif() + endforeach() + + if(NOT "${CPM_ARGS_UNPARSED_ARGUMENTS}" STREQUAL "") + if(${IS_IN_COMMENT}) + string(APPEND PRETTY_OUT_VAR "#") + endif() + string(APPEND PRETTY_OUT_VAR " ") + foreach(CPM_ARGS_UNPARSED_ARGUMENT ${CPM_ARGS_UNPARSED_ARGUMENTS}) + string(APPEND PRETTY_OUT_VAR " ${CPM_ARGS_UNPARSED_ARGUMENT}") + endforeach() + string(APPEND PRETTY_OUT_VAR "\n") + endif() + + set(${OUT_VAR} + ${PRETTY_OUT_VAR} + PARENT_SCOPE + ) + +endfunction() diff --git a/cmake/prepare.cmake b/cmake/prepare.cmake deleted file mode 100644 index aab312d0..00000000 --- a/cmake/prepare.cmake +++ /dev/null @@ -1,25 +0,0 @@ -# Enable Clang sanitizer for debug builds -if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - set(CMAKE_CXX_FLAGS_DEBUG - "${CMAKE_CXX_FLAGS_DEBUG} -fno-omit-frame-pointer -fsanitize=address -fsanitize=thread -fsanitize=memory" - CACHE STRING "") - set(CMAKE_EXE_LINKER_FLAGS_DEBUG - "${CMAKE_EXE_LINKER_FLAGS_DEBUGS} -fno-omit-frame-pointer -fsanitize=address -fsanitize=thread -fsanitize=memory" - CACHE STRING "") -endif() - -macro(SUBDIRLIST result curdir) - file( - GLOB children - RELATIVE ${curdir} - ${curdir}/*) - set(dirlist "") - foreach(child ${children}) - if(IS_DIRECTORY ${curdir}/${child}) - if(NOT ${child} STREQUAL "build") - list(APPEND dirlist ${child}) - endif() - endif() - endforeach() - set(${result} ${dirlist}) -endmacro() diff --git a/external/upstream/CMakeLists.txt b/external/upstream/CMakeLists.txt deleted file mode 100644 index 602ae08d..00000000 --- a/external/upstream/CMakeLists.txt +++ /dev/null @@ -1,38 +0,0 @@ -# external project base directory for all projects in this hierarchy. Set this variable here so that -# pythonBindings are not affected -set_property(DIRECTORY PROPERTY EP_BASE ${DEPENDENCIES_DIR}) - -# Macro to check if all of the libraries provided by the target list LIBRARY_TARGETS are compiled as -# the provided type (TARGET_TYPE: e.g. "STATIC_LIBRARY", "SHARED_LIBRARY", ...) -macro(CHECK_ALL_TYPE RESULT TARGET_TYPE LIBRARY_TARGETS) - set(_all_match TRUE) - foreach(_lib ${LIBRARY_TARGETS}) - if(TARGET ${_lib}) - get_target_property(_target_type ${_lib} TYPE) - # message(STATUS "${_lib}: ${_target_type} ${TARGET_TYPE}") - if(NOT _target_type STREQUAL ${TARGET_TYPE}) - set(_all_match FALSE) - break() - endif() - else() - message(WARNING "CHECK_ALL_TYPE: Not all targets were found!\- caused by ${_lib}") - set(_all_match FALSE) - break() - endif() - endforeach() - set(${RESULT} ${_all_match}) -endmacro() - -# OpenMP Support is required -find_package(OpenMP REQUIRED) - -# ViennaHRLE is also mandatory -add_subdirectory(viennahrle) - -if(VIENNALS_USE_VTK) - add_subdirectory(vtk) -endif() - -if(VIENNALS_BUILD_PYTHON) - add_subdirectory(pybind11) -endif() diff --git a/external/upstream/pybind11/CMakeLists.txt b/external/upstream/pybind11/CMakeLists.txt deleted file mode 100644 index 50ab47b3..00000000 --- a/external/upstream/pybind11/CMakeLists.txt +++ /dev/null @@ -1,66 +0,0 @@ -# ################################################################################################## -# Check pybind11 Dependency -# ################################################################################################## -# If the path to an installation was provided by the user -if(DEFINED pybind11_DIR AND NOT DEFINED CACHE{pybind11_DIR}) - # Required for windows to convert backslashes to forward slashes - file(TO_CMAKE_PATH "${pybind11_DIR}" pybind11_DIR) - set(pybind11_DIR - "${pybind11_DIR}" - CACHE PATH "Path to pybind11 installation" FORCE) - find_package(pybind11 REQUIRED PATHS ${pybind11_FOUND} NO_DEFAULT_PATH) - message(STATUS "pybind11_DIR: ${pybind11_DIR}") - add_library(pybind11_external INTERFACE) # dummy target -else() - # First try to locate any local build - find_package(pybind11 QUIET PATHS "${DEPENDENCIES_DIR}/Install/pybind11_external" NO_DEFAULT_PATH) - # If that fails look for a system installation - if(NOT pybind11_FOUND) - find_package(pybind11 QUIET) - endif() - if(pybind11_FOUND) - message(STATUS "Found pybind11 at ${pybind11_DIR}.") - add_library(pybind11_external INTERFACE) # dummy target - else() - message( - STATUS - "Couldn't find pybind11. Dependency will be built with the buildDependencies target (e.g. `make buildDependencies`)." - ) - - # Get the number of cores - include(ProcessorCount) - ProcessorCount(NPROC) - - ExternalProject_Add( - pybind11_external - GIT_REPOSITORY https://github.com/pybind/pybind11.git - # Hash of tags/v2.10.4 - GIT_TAG 5b0a6fc2017fcc176545afe3e09c9f9885283242 - # GIT_SHALLOW 1 - CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release - -DCMAKE_INSTALL_PREFIX:PATH= - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} - -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS} - -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED} - -DBUILD_TESTING=OFF - -DBUILD_EXAMPLES=OFF - BUILD_COMMAND ${CMAKE_COMMAND} --build . --parallel ${NPROC} - INSTALL_COMMAND ${CMAKE_COMMAND} --install . - UPDATE_COMMAND "" - USES_TERMINAL_DOWNLOAD 1 - USES_TERMINAL_UPDATE 1 - GIT_PROGRESS 1) - - # Get install and build directory - ExternalProject_Get_Property(pybind11_external INSTALL_DIR) - set(pybind11_DIR "${INSTALL_DIR}") - # add to buildDependencies target - add_dependencies(buildDependencies pybind11_external) - - endif() - set(pybind11_DIR - "${pybind11_DIR}" - CACHE PATH "Path to pybind11 installation" FORCE) -endif() diff --git a/external/upstream/viennahrle/CMakeLists.txt b/external/upstream/viennahrle/CMakeLists.txt deleted file mode 100644 index 011a513d..00000000 --- a/external/upstream/viennahrle/CMakeLists.txt +++ /dev/null @@ -1,58 +0,0 @@ -# ################################################################################################## -# Check ViennaHRLE Dependency -# ################################################################################################## -# If the path to an installation was provided by the user -if(DEFINED ViennaHRLE_DIR AND NOT DEFINED CACHE{ViennaHRLE_DIR}) - # Required for windows to convert backslashes to forward slashes - file(TO_CMAKE_PATH "${ViennaHRLE_DIR}" ViennaHRLE_DIR) - set(ViennaHRLE_DIR - "${ViennaHRLE_DIR}" - CACHE PATH "Path to ViennaHRLE installation" FORCE) - find_package(ViennaHRLE REQUIRED PATHS ${ViennaHRLE_DIR} NO_DEFAULT_PATH) - message(STATUS "ViennaHRLE_DIR: ${ViennaHRLE_DIR}") - add_library(viennahrle_external INTERFACE) # dummy target -else() - # First try to locate any local build - find_package(ViennaHRLE QUIET PATHS "${DEPENDENCIES_DIR}/Install/viennahrle_external" - NO_DEFAULT_PATH) - # If that fails look for a system installation - if(NOT ViennaHRLE_FOUND) - find_package(ViennaHRLE QUIET) - endif() - if(ViennaHRLE_FOUND) - message(STATUS "Found ViennaHRLE at ${ViennaHRLE_DIR}.") - add_library(viennahrle_external INTERFACE) # dummy target - else() - message( - STATUS - "Couldn't find ViennaHRLE. Dependency will be built with the buildDependencies target (e.g. `make buildDependencies`)." - ) - ExternalProject_Add( - viennahrle_external - GIT_REPOSITORY https://github.com/ViennaTools/ViennaHRLE - GIT_SHALLOW 1 # use --depth 1 when cloning - CMAKE_ARGS -DCMAKE_INSTALL_PREFIX:PATH= -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DVIENNAHRLE_BUILD_EXAMPLES=OFF - -DVIENNAHRLE_BUILD_TESTS=OFF - USES_TERMINAL_DOWNLOAD 1 - USES_TERMINAL_UPDATE 1 - GIT_PROGRESS 1) - - # Get install and build directory - ExternalProject_Get_Property(viennahrle_external INSTALL_DIR BINARY_DIR) - - # Set the required variables - set(ViennaHRLE_DIR "${INSTALL_DIR}") - set(ViennaHRLE_INCLUDE_DIRS "${ViennaHRLE_DIR}/include") - - # add to buildDependencies target - add_dependencies(buildDependencies viennahrle_external) - - endif() - set(ViennaHRLE_DIR - "${ViennaHRLE_DIR}" - CACHE PATH "Path to ViennaHRLE installation" FORCE) - set(ViennaHRLE_INCLUDE_DIRS - "${ViennaHRLE_INCLUDE_DIRS}" - CACHE PATH "Path to ViennaHRLE headers" FORCE) -endif() diff --git a/external/upstream/vtk/CMakeLists.txt b/external/upstream/vtk/CMakeLists.txt deleted file mode 100644 index a80c4245..00000000 --- a/external/upstream/vtk/CMakeLists.txt +++ /dev/null @@ -1,160 +0,0 @@ -# ################################################################################################## -# Check VTK Dependency -# ################################################################################################## - -# Get the number of cores -include(ProcessorCount) -ProcessorCount(NPROC) - -# if this is a static build, also build vtk statically -if(VIENNALS_STATIC_BUILD) - set(VTK_EXTERNAL_BUILD_SHARED OFF) - set(VTK_EXTERNAL_INSTALL "static_vtk_external") - message(STATUS "Static build: Using static VTK libs.") -else() - set(VTK_EXTERNAL_BUILD_SHARED ON) - set(VTK_EXTERNAL_INSTALL "vtk_external") -endif() - -set(VTK_COMPONENTS - vtkCommonCore;vtkIOCore;vtkIOXML;vtkIOXMLParser;vtkFiltersCore;vtkFiltersGeneral;vtkFiltersGeometry -) - -# List of VTK 9+ library targets -set(VTK_LIBRARY_TARGETS - VTK::CommonComputationalGeometry;VTK::CommonCore;VTK::CommonDataModel;VTK::CommonExecutionModel;VTK::CommonMath;VTK::CommonMisc;VTK::CommonSystem;VTK::CommonTransforms;VTK::FiltersCore;VTK::FiltersGeneral;VTK::FiltersGeometry;VTK::IOCore;VTK::IOXML;VTK::IOXMLParser;VTK::WrappingTools -) - -# If the path to an installation was provided by the user -if(DEFINED VTK_DIR AND NOT DEFINED CACHE{VTK_DIR}) - # Required for windows to convert backslashes to forward slashes - file(TO_CMAKE_PATH "${VTK_DIR}" VTK_DIR) - set(VTK_DIR - "${VTK_DIR}" - CACHE PATH "Path to VTK installation" FORCE) - find_package(VTK CONFIG REQUIRED PATHS ${VTK_DIR} COMPONENTS "${VTK_COMPONENTS}" NO_DEFAULT_PATH) - if(VIENNALS_STATIC_BUILD) - check_all_type(ALL_STATIC "STATIC_LIBRARY" "${VTK_LIBRARY_TARGETS}") - if(NOT ${ALL_STATIC}) - message( - FATAL_ERROR - "Not all of the targets which were exported by the provided VTK installation were built to be statically linked." - ) - endif() - endif() - message(STATUS "Found VTK at ${VTK_DIR}.") - add_library(vtk_external INTERFACE) # dummy target -else() # Automatically detect installation - # First try to locate any local build - find_package(VTK QUIET PATHS "${DEPENDENCIES_DIR}/Install/${VTK_EXTERNAL_INSTALL}" - COMPONENTS "${VTK_COMPONENTS}" NO_DEFAULT_PATH) - - # If that fails look for a system installation - if(NOT VTK_FOUND) - find_package(VTK QUIET COMPONENTS "${VTK_COMPONENTS}") - endif() - - if(VIENNALS_STATIC_BUILD) - # Check if the library can be statically linked - check_all_type(ALL_STATIC "STATIC_LIBRARY" "${VTK_LIBRARY_TARGETS}") - if(NOT ${ALL_STATIC}) - set(VTK_FOUND FALSE) - message( - STATUS - "The detected installation of VTK was not built using BUILD_SHARED_LIBS=OFF. Static VTK libraries will be built from source." - ) - endif() - endif() - - if(VTK_FOUND) - message(STATUS "Found VTK at ${VTK_DIR}.") - add_library(vtk_external INTERFACE) # dummy target - else() - message( - STATUS - "Couldn't find VTK. Dependency will be built with the buildDependencies target (e.g. `make buildDependencies`)." - ) - - ExternalProject_Add( - vtk_external - GIT_REPOSITORY https://gitlab.kitware.com/vtk/vtk.git - # Hash of tags/v9.2.6 - GIT_TAG f2c452c9c42005672a3f3ed9218dd9a7fecca79a - GIT_SHALLOW true - GIT_SUBMODULES "" - TMP_DIR "${DEPENDENCIES_DIR}/tmp/${VTK_EXTERNAL_INSTALL}" - STAMP_DIR "${DEPENDENCIES_DIR}/Stamp/${VTK_EXTERNAL_INSTALL}" - BINARY_DIR "${DEPENDENCIES_DIR}/Build/${VTK_EXTERNAL_INSTALL}" - INSTALL_DIR "${DEPENDENCIES_DIR}/Install/${VTK_EXTERNAL_INSTALL}" - CMAKE_ARGS -DCMAKE_BUILD_TYPE=Release - -DCMAKE_INSTALL_PREFIX:PATH= - -DCMAKE_SKIP_RPATH=OFF - -DCMAKE_SKIP_INSTALL_RPATH=ON - -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} - -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} - -DCMAKE_CXX_STANDARD=${CMAKE_CXX_STANDARD} - -DCMAKE_CXX_EXTENSIONS=${CMAKE_CXX_EXTENSIONS} - -DCMAKE_CXX_STANDARD_REQUIRED=${CMAKE_CXX_STANDARD_REQUIRED} - -DBUILD_SHARED_LIBS:BOOL=${VTK_EXTERNAL_BUILD_SHARED} - -DVTK_BUILD_TESTING=OFF - -DVTK_BUILD_EXAMPLES=OFF - -DVTK_BUILD_DOCUMENTATION=OFF - -DVTK_VERSIONED_INSTALL=OFF - -DVTK_WRAP_PYTHON:BOOL=NO - -DVTK_SMP_IMPLEMENTATION_TYPE:STRING="OpenMP" - -DVTK_GROUP_ENABLE_Rendering:BOOL=NO - -DVTK_GROUP_ENABLE_Imaging:BOOL=NO - -DVTK_GROUP_ENABLE_MPI:BOOL=NO - -DVTK_GROUP_ENABLE_Qt:BOOL=NO - -DVTK_GROUP_ENABLE_StandAlone:BOOL=NO - -DVTK_GROUP_ENABLE_Views:BOOL=NO - -DVTK_GROUP_ENABLE_Web:BOOL=NO - -DVTK_LEGACY_REMOVE:BOOL=ON - -DVTK_MODULE_ENABLE_VTK_CommonExecutionModel:BOOL=YES - -DVTK_MODULE_ENABLE_VTK_CommonMisc:BOOL=YES - -DVTK_MODULE_ENABLE_VTK_CommonSystem:BOOL=YES - -DVTK_MODULE_ENABLE_VTK_CommonMath:BOOL=YES - -DVTK_MODULE_ENABLE_VTK_CommonCore:BOOL=YES - -DVTK_MODULE_ENABLE_VTK_CommonTransforms:BOOL=YES - -DVTK_MODULE_ENABLE_VTK_CommonComputationalGeometry:BOOL=YES - -DVTK_MODULE_ENABLE_VTK_IOCore:BOOL=YES - -DVTK_MODULE_ENABLE_VTK_IOXMLParser:BOOL=YES - -DVTK_MODULE_ENABLE_VTK_IOXML:BOOL=YES - -DVTK_MODULE_ENABLE_VTK_FiltersCore:BOOL=YES - -DVTK_MODULE_ENABLE_VTK_FiltersGeneral:BOOL=YES - -DVTK_MODULE_ENABLE_VTK_FiltersGeometry:BOOL=YES - -Wno-dev - BUILD_COMMAND ${CMAKE_COMMAND} --build . --parallel ${NPROC} --config Release - INSTALL_COMMAND ${CMAKE_COMMAND} --install . - UPDATE_COMMAND "" - USES_TERMINAL_DOWNLOAD 1 - USES_TERMINAL_UPDATE 1 - GIT_PROGRESS 1) - - # Get install directory - ExternalProject_Get_Property(vtk_external INSTALL_DIR) - - # Set the required variables - set(VTK_DIR "${INSTALL_DIR}") - - set(VTK_VERSION 9.2) - set(VTK_INCLUDE_DIRS "${VTK_DIR}/include/vtk-${VTK_VERSION}") - - # add to buildDependencies target - add_dependencies(buildDependencies vtk_external) - endif() - - # Write VTK_DIR, VTK_VERSION and VTK_INCLUDE_DIRS to the cache so that we can use it in the - # toplevel CMakeLists file - set(VTK_DIR - ${VTK_DIR} - CACHE PATH "Path to VTK installation" FORCE) - - set(VTK_VERSION - ${VTK_VERSION} - CACHE STRING "The VTK version" FORCE) - - set(VTK_INCLUDE_DIRS - ${VTK_INCLUDE_DIRS} - CACHE STRING "Path to VTK headers" FORCE) -endif() From 028c68603e0ecb9330c8aa515001a506d2dec161 Mon Sep 17 00:00:00 2001 From: Curve Date: Tue, 21 Nov 2023 02:01:41 +0100 Subject: [PATCH 02/41] refactor(cmake): update examples --- Examples/AirGapDeposition/CMakeLists.txt | 10 +++------ Examples/CMakeLists.txt | 25 ++++++---------------- Examples/Deposition/CMakeLists.txt | 10 +++------ Examples/GeometricAdvection/CMakeLists.txt | 10 +++------ Examples/PatternedSubstrate/CMakeLists.txt | 10 +++------ Examples/PeriodicBoundary/CMakeLists.txt | 10 +++------ Examples/SharedLib/CMakeLists.txt | 10 +++------ Examples/SquareEtch/CMakeLists.txt | 10 +++------ Examples/VoidEtching/CMakeLists.txt | 10 +++------ Examples/VolumeToLevelSets/CMakeLists.txt | 10 +++------ 10 files changed, 33 insertions(+), 82 deletions(-) diff --git a/Examples/AirGapDeposition/CMakeLists.txt b/Examples/AirGapDeposition/CMakeLists.txt index 632ab0b6..87c4dc22 100644 --- a/Examples/AirGapDeposition/CMakeLists.txt +++ b/Examples/AirGapDeposition/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(AirGapDeposition LANGUAGES CXX) -project("AirGapDeposition") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to example target -add_dependencies(buildExamples ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 3f471486..12f53f57 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -1,22 +1,9 @@ -cmake_minimum_required(VERSION 3.14) +file(GLOB entries LIST_DIRECTORIES true "*") -project(ViennaLSExamples) +foreach(entry ${entries}) + IF(NOT IS_DIRECTORY ${entry}) + CONTINUE() + ENDIF() -include("${CMAKE_SOURCE_DIR}/cmake/prepare.cmake") - -# Point find_package to the binary directory instead of the install location -find_package(ViennaLS REQUIRED PATHS ${ViennaLS_BINARY_DIR} NO_DEFAULT_PATH) - -list(PREPEND VIENNALS_INCLUDE_DIRS ${VIENNALS_BUILD_INCLUDE_DIRS}) - -# Exclude the buildExamples target from the `all` target -set_property(DIRECTORY PROPERTY EXCLUDE_FROM_ALL TRUE) - -add_custom_target(buildExamples DEPENDS ${VIENNALS_DEPENDENCIES}) - -subdirlist(EXAMPLE_DIRS ${CMAKE_CURRENT_LIST_DIR}) - -# add all examples -foreach(subdir ${EXAMPLE_DIRS}) - add_subdirectory(${subdir}) + add_subdirectory(${entry}) endforeach() diff --git a/Examples/Deposition/CMakeLists.txt b/Examples/Deposition/CMakeLists.txt index 5ab78479..5fdcaa17 100644 --- a/Examples/Deposition/CMakeLists.txt +++ b/Examples/Deposition/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(Deposition LANGUAGES CXX) -project("Deposition") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to example target -add_dependencies(buildExamples ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Examples/GeometricAdvection/CMakeLists.txt b/Examples/GeometricAdvection/CMakeLists.txt index 93649e16..2df1557c 100644 --- a/Examples/GeometricAdvection/CMakeLists.txt +++ b/Examples/GeometricAdvection/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(GeometricAdvection LANGUAGES CXX) -project("GeometricAdvection") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to example target -add_dependencies(buildExamples ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Examples/PatternedSubstrate/CMakeLists.txt b/Examples/PatternedSubstrate/CMakeLists.txt index cc4e5bd3..4eded8d2 100644 --- a/Examples/PatternedSubstrate/CMakeLists.txt +++ b/Examples/PatternedSubstrate/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(PatternedSubstrate LANGUAGES CXX) -project("PatternedSubstrate") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to example target -add_dependencies(buildExamples ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Examples/PeriodicBoundary/CMakeLists.txt b/Examples/PeriodicBoundary/CMakeLists.txt index 6674ed34..beae9375 100644 --- a/Examples/PeriodicBoundary/CMakeLists.txt +++ b/Examples/PeriodicBoundary/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(PeriodicBoundary LANGUAGES CXX) -project("PeriodicBoundary") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to example target -add_dependencies(buildExamples ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Examples/SharedLib/CMakeLists.txt b/Examples/SharedLib/CMakeLists.txt index f6d0ab62..69db0e2c 100644 --- a/Examples/SharedLib/CMakeLists.txt +++ b/Examples/SharedLib/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(SharedLib LANGUAGES CXX) -project("SharedLib") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to example target -add_dependencies(buildExamples ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Examples/SquareEtch/CMakeLists.txt b/Examples/SquareEtch/CMakeLists.txt index 1012c550..f9b20d43 100644 --- a/Examples/SquareEtch/CMakeLists.txt +++ b/Examples/SquareEtch/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(SquareEtch LANGUAGES CXX) -project("SquareEtch") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to example target -add_dependencies(buildExamples ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Examples/VoidEtching/CMakeLists.txt b/Examples/VoidEtching/CMakeLists.txt index 3865c3b8..44c1e6e4 100644 --- a/Examples/VoidEtching/CMakeLists.txt +++ b/Examples/VoidEtching/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(VoidEtching LANGUAGES CXX) -project("VoidEtching") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to example target -add_dependencies(buildExamples ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Examples/VolumeToLevelSets/CMakeLists.txt b/Examples/VolumeToLevelSets/CMakeLists.txt index 969fe192..acf5a686 100644 --- a/Examples/VolumeToLevelSets/CMakeLists.txt +++ b/Examples/VolumeToLevelSets/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(VolumeToLevelSets LANGUAGES CXX) -project("VolumeToLevelSets") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to example target -add_dependencies(buildExamples ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) From 54fbd013885861f20b91944f5d086990ef98e085 Mon Sep 17 00:00:00 2001 From: Curve Date: Tue, 21 Nov 2023 02:01:52 +0100 Subject: [PATCH 03/41] refactor(cmake): update tests --- Tests/Advection/CMakeLists.txt | 10 +++------ Tests/Advection2D/CMakeLists.txt | 10 +++------ Tests/AdvectionBenchmark/CMakeLists.txt | 12 +++------- Tests/AdvectionPlane/CMakeLists.txt | 10 +++------ Tests/BooleanOperation/CMakeLists.txt | 10 +++------ .../BooleanOperationExactZero/CMakeLists.txt | 10 +++------ .../BooleanOperationExactZero1/CMakeLists.txt | 10 +++------ Tests/BoundaryConditions/CMakeLists.txt | 10 +++------ Tests/CMakeLists.txt | 22 +++++-------------- Tests/CalculateCurvatures/CMakeLists.txt | 10 +++------ Tests/CalculateNormalVectors/CMakeLists.txt | 10 +++------ Tests/ConvexHull/CMakeLists.txt | 9 +++----- Tests/ConvexHull3D/CMakeLists.txt | 9 +++----- Tests/DiskMesh/CMakeLists.txt | 10 +++------ Tests/Expand/CMakeLists.txt | 9 +++----- Tests/Extrude/CMakeLists.txt | 9 +++----- Tests/FeatureDetection/CMakeLists.txt | 9 +++----- Tests/FileWriter/CMakeLists.txt | 10 +++------ Tests/FromMesh/CMakeLists.txt | 9 +++----- Tests/GenerateHoleGeometry/CMakeLists.txt | 8 +++---- Tests/GeometricAdvect/CMakeLists.txt | 9 +++----- Tests/GeometricAdvectMask/CMakeLists.txt | 9 +++----- .../GeometricAdvectPerformance/CMakeLists.txt | 12 +++------- Tests/GeometricAdvectTrench/CMakeLists.txt | 9 +++----- Tests/HullMesh/CMakeLists.txt | 9 +++----- Tests/Make3DSphere/CMakeLists.txt | 9 +++----- Tests/MakeBox/CMakeLists.txt | 10 +++------ Tests/MakeGeometry/CMakeLists.txt | 9 +++----- Tests/MakePlane/CMakeLists.txt | 10 +++------ Tests/MakeSphere/CMakeLists.txt | 9 +++----- Tests/MarkVoidPoints/CMakeLists.txt | 10 +++------ Tests/MultiMaterialAdvection/CMakeLists.txt | 9 +++----- Tests/MultiMaterialEtch/CMakeLists.txt | 9 +++----- Tests/PeriodicBoundary2D/CMakeLists.txt | 9 +++----- Tests/ReadFromFile/CMakeLists.txt | 9 +++----- Tests/ReadVolume/CMakeLists.txt | 9 +++----- Tests/RemoveStrayPoints/CMakeLists.txt | 10 +++------ Tests/RotateMesh/CMakeLists.txt | 9 +++----- Tests/Serialize/CMakeLists.txt | 9 +++----- Tests/SmartPointer/CMakeLists.txt | 9 +++----- Tests/VisualizationMesh/CMakeLists.txt | 14 ++++-------- Tests/VoidDetection/CMakeLists.txt | 9 +++----- 42 files changed, 131 insertions(+), 285 deletions(-) diff --git a/Tests/Advection/CMakeLists.txt b/Tests/Advection/CMakeLists.txt index a31a6338..e82b214a 100644 --- a/Tests/Advection/CMakeLists.txt +++ b/Tests/Advection/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(Advection LANGUAGES CXX) -project("Advection") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to test framework -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/Advection2D/CMakeLists.txt b/Tests/Advection2D/CMakeLists.txt index 8d62df85..bfe681d6 100644 --- a/Tests/Advection2D/CMakeLists.txt +++ b/Tests/Advection2D/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(Advection2D LANGUAGES CXX) -project("Advection2D") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to test framework -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/AdvectionBenchmark/CMakeLists.txt b/Tests/AdvectionBenchmark/CMakeLists.txt index 455aebd6..99cc0122 100644 --- a/Tests/AdvectionBenchmark/CMakeLists.txt +++ b/Tests/AdvectionBenchmark/CMakeLists.txt @@ -1,13 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(AdvectionBenchmark LANGUAGES CXX) -project("AdvectionBenchmark") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) - -# Label this test as a benchmark -set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS benchmark) diff --git a/Tests/AdvectionPlane/CMakeLists.txt b/Tests/AdvectionPlane/CMakeLists.txt index 42da6b40..ace9e016 100644 --- a/Tests/AdvectionPlane/CMakeLists.txt +++ b/Tests/AdvectionPlane/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(AdvectionPlane LANGUAGES CXX) -project("AdvectionPlane") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to test framework -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/BooleanOperation/CMakeLists.txt b/Tests/BooleanOperation/CMakeLists.txt index 96ecafea..6f7d02b1 100644 --- a/Tests/BooleanOperation/CMakeLists.txt +++ b/Tests/BooleanOperation/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(BooleanOperation LANGUAGES CXX) -project("BooleanOperation") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to test framework -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/BooleanOperationExactZero/CMakeLists.txt b/Tests/BooleanOperationExactZero/CMakeLists.txt index 23d6b9b4..e224a071 100644 --- a/Tests/BooleanOperationExactZero/CMakeLists.txt +++ b/Tests/BooleanOperationExactZero/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(BooleanOperationExactZero LANGUAGES CXX) -project("BooleanOperationExactZero") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to test framework -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/BooleanOperationExactZero1/CMakeLists.txt b/Tests/BooleanOperationExactZero1/CMakeLists.txt index e8800eaf..39336c1f 100644 --- a/Tests/BooleanOperationExactZero1/CMakeLists.txt +++ b/Tests/BooleanOperationExactZero1/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(BooleanOperationExactZero1 LANGUAGES CXX) -project("BooleanOperationExactZero1") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to test framework -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/BoundaryConditions/CMakeLists.txt b/Tests/BoundaryConditions/CMakeLists.txt index 572c0350..0c6b23ab 100644 --- a/Tests/BoundaryConditions/CMakeLists.txt +++ b/Tests/BoundaryConditions/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(BoundaryConditions LANGUAGES CXX) -project("BoundaryConditions") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to test framework -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 910d9ca9..12f53f57 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1,19 +1,9 @@ -cmake_minimum_required(VERSION 3.14) +file(GLOB entries LIST_DIRECTORIES true "*") -project(ViennaLSTests) +foreach(entry ${entries}) + IF(NOT IS_DIRECTORY ${entry}) + CONTINUE() + ENDIF() -include("${CMAKE_SOURCE_DIR}/cmake/prepare.cmake") - -# Point find_package to the binary directory instead of the install location -find_package(ViennaLS REQUIRED CONFIG PATHS ${ViennaLS_BINARY_DIR} NO_DEFAULT_PATH) - -list(PREPEND VIENNALS_INCLUDE_DIRS ${VIENNALS_BUILD_INCLUDE_DIRS}) - -add_custom_target(buildTests DEPENDS ${VIENNALS_DEPENDENCIES}) - -subdirlist(TEST_DIRS ${CMAKE_CURRENT_LIST_DIR}) - -# add all tests -foreach(subdir ${TEST_DIRS}) - add_subdirectory(${subdir}) + add_subdirectory(${entry}) endforeach() diff --git a/Tests/CalculateCurvatures/CMakeLists.txt b/Tests/CalculateCurvatures/CMakeLists.txt index 1f74afda..1fa9d7af 100644 --- a/Tests/CalculateCurvatures/CMakeLists.txt +++ b/Tests/CalculateCurvatures/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(CalculateCurvatures LANGUAGES CXX) -project("CalculateCurvatures") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to test framework -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/CalculateNormalVectors/CMakeLists.txt b/Tests/CalculateNormalVectors/CMakeLists.txt index 662fb1dc..f798850d 100644 --- a/Tests/CalculateNormalVectors/CMakeLists.txt +++ b/Tests/CalculateNormalVectors/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(CalculateNormalVectors LANGUAGES CXX) -project("CalculateNormalVectors") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to test framework -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/ConvexHull/CMakeLists.txt b/Tests/ConvexHull/CMakeLists.txt index a82ca3bc..e9119411 100644 --- a/Tests/ConvexHull/CMakeLists.txt +++ b/Tests/ConvexHull/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(ConvexHull LANGUAGES CXX) -project("ConvexHull") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/ConvexHull3D/CMakeLists.txt b/Tests/ConvexHull3D/CMakeLists.txt index 0e305d39..9e368bcf 100644 --- a/Tests/ConvexHull3D/CMakeLists.txt +++ b/Tests/ConvexHull3D/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(ConvexHull3D LANGUAGES CXX) -project("ConvexHull3D") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/DiskMesh/CMakeLists.txt b/Tests/DiskMesh/CMakeLists.txt index 195608eb..9093599d 100644 --- a/Tests/DiskMesh/CMakeLists.txt +++ b/Tests/DiskMesh/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(DiskMesh LANGUAGES CXX) -project("DiskMesh") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to test framework -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/Expand/CMakeLists.txt b/Tests/Expand/CMakeLists.txt index 6035a636..abdf0cc6 100644 --- a/Tests/Expand/CMakeLists.txt +++ b/Tests/Expand/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(Expand LANGUAGES CXX) -project("Expand") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/Extrude/CMakeLists.txt b/Tests/Extrude/CMakeLists.txt index 4ed0d7b1..cbed8d86 100644 --- a/Tests/Extrude/CMakeLists.txt +++ b/Tests/Extrude/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(Extrude LANGUAGES CXX) -project("Extrude") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/FeatureDetection/CMakeLists.txt b/Tests/FeatureDetection/CMakeLists.txt index cad58462..d2bf7865 100644 --- a/Tests/FeatureDetection/CMakeLists.txt +++ b/Tests/FeatureDetection/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(FeatureDetection LANGUAGES CXX) -project("FeatureDetection") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/FileWriter/CMakeLists.txt b/Tests/FileWriter/CMakeLists.txt index 32d94d67..7271e9fd 100644 --- a/Tests/FileWriter/CMakeLists.txt +++ b/Tests/FileWriter/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(FileWriter LANGUAGES CXX) -project("FileWriter") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to test framework -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/FromMesh/CMakeLists.txt b/Tests/FromMesh/CMakeLists.txt index 9303f346..a2f7aae0 100644 --- a/Tests/FromMesh/CMakeLists.txt +++ b/Tests/FromMesh/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(FromMesh LANGUAGES CXX) -project("FromMesh") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/GenerateHoleGeometry/CMakeLists.txt b/Tests/GenerateHoleGeometry/CMakeLists.txt index a3d8024d..69c56ef9 100644 --- a/Tests/GenerateHoleGeometry/CMakeLists.txt +++ b/Tests/GenerateHoleGeometry/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(GenerateHoleGeometry LANGUAGES CXX) -project("GenerateHoleGeometry") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) +add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/GeometricAdvect/CMakeLists.txt b/Tests/GeometricAdvect/CMakeLists.txt index 437b06fa..d353115b 100644 --- a/Tests/GeometricAdvect/CMakeLists.txt +++ b/Tests/GeometricAdvect/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(GeometricAdvect LANGUAGES CXX) -project("GeometricAdvect") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/GeometricAdvectMask/CMakeLists.txt b/Tests/GeometricAdvectMask/CMakeLists.txt index f2f968b8..509c4d1e 100644 --- a/Tests/GeometricAdvectMask/CMakeLists.txt +++ b/Tests/GeometricAdvectMask/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(GeometricAdvectMask LANGUAGES CXX) -project("GeometricAdvectMask") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/GeometricAdvectPerformance/CMakeLists.txt b/Tests/GeometricAdvectPerformance/CMakeLists.txt index dad24981..0e32974f 100644 --- a/Tests/GeometricAdvectPerformance/CMakeLists.txt +++ b/Tests/GeometricAdvectPerformance/CMakeLists.txt @@ -1,13 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(GeometricAdvectPerformance LANGUAGES CXX) -project("GeometricAdvectPerformance") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) - -# Label this test as a benchmark -set_tests_properties(${PROJECT_NAME} PROPERTIES LABELS benchmark) diff --git a/Tests/GeometricAdvectTrench/CMakeLists.txt b/Tests/GeometricAdvectTrench/CMakeLists.txt index 072eacc9..a2fbe02f 100644 --- a/Tests/GeometricAdvectTrench/CMakeLists.txt +++ b/Tests/GeometricAdvectTrench/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(GeometricAdvectTrench LANGUAGES CXX) -project("GeometricAdvectTrench") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/HullMesh/CMakeLists.txt b/Tests/HullMesh/CMakeLists.txt index be6a5594..9c9a725c 100644 --- a/Tests/HullMesh/CMakeLists.txt +++ b/Tests/HullMesh/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(HullMesh LANGUAGES CXX) -project("HullMesh") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/Make3DSphere/CMakeLists.txt b/Tests/Make3DSphere/CMakeLists.txt index 80f0225e..00b0ecd7 100644 --- a/Tests/Make3DSphere/CMakeLists.txt +++ b/Tests/Make3DSphere/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(Make3DSphere LANGUAGES CXX) -project("Make3DSphere") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/MakeBox/CMakeLists.txt b/Tests/MakeBox/CMakeLists.txt index f98e4698..42faadfc 100644 --- a/Tests/MakeBox/CMakeLists.txt +++ b/Tests/MakeBox/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(MakeBox LANGUAGES CXX) -project("MakeBox") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to test framework -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/MakeGeometry/CMakeLists.txt b/Tests/MakeGeometry/CMakeLists.txt index bd76f15c..e06e83cc 100644 --- a/Tests/MakeGeometry/CMakeLists.txt +++ b/Tests/MakeGeometry/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(MakeGeometry LANGUAGES CXX) -project("MakeGeometry") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/MakePlane/CMakeLists.txt b/Tests/MakePlane/CMakeLists.txt index bdf6e773..9b6a797d 100644 --- a/Tests/MakePlane/CMakeLists.txt +++ b/Tests/MakePlane/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(MakePlane LANGUAGES CXX) -project("MakePlane") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to test framework -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/MakeSphere/CMakeLists.txt b/Tests/MakeSphere/CMakeLists.txt index 7d9776c5..39859d9b 100644 --- a/Tests/MakeSphere/CMakeLists.txt +++ b/Tests/MakeSphere/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(MakeSphere LANGUAGES CXX) -project("MakeSphere") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/MarkVoidPoints/CMakeLists.txt b/Tests/MarkVoidPoints/CMakeLists.txt index c9bffc16..13577455 100644 --- a/Tests/MarkVoidPoints/CMakeLists.txt +++ b/Tests/MarkVoidPoints/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(MarkVoidPoints LANGUAGES CXX) -project("MarkVoidPoints") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to test framework -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/MultiMaterialAdvection/CMakeLists.txt b/Tests/MultiMaterialAdvection/CMakeLists.txt index d43e37ae..a1d9cfe7 100644 --- a/Tests/MultiMaterialAdvection/CMakeLists.txt +++ b/Tests/MultiMaterialAdvection/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(MultiMaterialAdvection LANGUAGES CXX) -project("MultiMaterialAdvection") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/MultiMaterialEtch/CMakeLists.txt b/Tests/MultiMaterialEtch/CMakeLists.txt index 88f8fe1c..798dde7f 100644 --- a/Tests/MultiMaterialEtch/CMakeLists.txt +++ b/Tests/MultiMaterialEtch/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(MultiMaterialEtch LANGUAGES CXX) -project("MultiMaterialEtch") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/PeriodicBoundary2D/CMakeLists.txt b/Tests/PeriodicBoundary2D/CMakeLists.txt index 803cc0cf..cd7023a7 100644 --- a/Tests/PeriodicBoundary2D/CMakeLists.txt +++ b/Tests/PeriodicBoundary2D/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(PeriodicBoundary2D LANGUAGES CXX) -project("PeriodicBoundary2D") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/ReadFromFile/CMakeLists.txt b/Tests/ReadFromFile/CMakeLists.txt index 8f96f56d..d4c55b3f 100644 --- a/Tests/ReadFromFile/CMakeLists.txt +++ b/Tests/ReadFromFile/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(ReadFromFile LANGUAGES CXX) -project("ReadFromFile") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/ReadVolume/CMakeLists.txt b/Tests/ReadVolume/CMakeLists.txt index 406099c7..0bbadb25 100644 --- a/Tests/ReadVolume/CMakeLists.txt +++ b/Tests/ReadVolume/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(ReadVolume LANGUAGES CXX) -project("ReadVolume") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/RemoveStrayPoints/CMakeLists.txt b/Tests/RemoveStrayPoints/CMakeLists.txt index 0c3f0633..4c8600a2 100644 --- a/Tests/RemoveStrayPoints/CMakeLists.txt +++ b/Tests/RemoveStrayPoints/CMakeLists.txt @@ -1,11 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(RemoveStrayPoints LANGUAGES CXX) -project("RemoveStrayPoints") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -# Add to test framework -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/RotateMesh/CMakeLists.txt b/Tests/RotateMesh/CMakeLists.txt index 4d5407e6..83f2c959 100644 --- a/Tests/RotateMesh/CMakeLists.txt +++ b/Tests/RotateMesh/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(RotateMesh LANGUAGES CXX) -project("RotateMesh") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/Serialize/CMakeLists.txt b/Tests/Serialize/CMakeLists.txt index 77e16e70..5e5238cc 100644 --- a/Tests/Serialize/CMakeLists.txt +++ b/Tests/Serialize/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(Serialize LANGUAGES CXX) -project("Serialize") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/SmartPointer/CMakeLists.txt b/Tests/SmartPointer/CMakeLists.txt index 08de8b3c..39044975 100644 --- a/Tests/SmartPointer/CMakeLists.txt +++ b/Tests/SmartPointer/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(SmartPointer LANGUAGES CXX) -project("SmartPointer") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/VisualizationMesh/CMakeLists.txt b/Tests/VisualizationMesh/CMakeLists.txt index df6d59f9..09915af4 100644 --- a/Tests/VisualizationMesh/CMakeLists.txt +++ b/Tests/VisualizationMesh/CMakeLists.txt @@ -1,13 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(VisualizationMesh LANGUAGES CXX) -project("VisualizationMesh") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -if(VIENNALS_USE_VTK) - add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) - target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) - target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - - add_dependencies(buildTests ${PROJECT_NAME}) - add_test(NAME ${PROJECT_NAME} COMMAND $) - -endif() +add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/VoidDetection/CMakeLists.txt b/Tests/VoidDetection/CMakeLists.txt index 50c5bff1..df1dcc24 100644 --- a/Tests/VoidDetection/CMakeLists.txt +++ b/Tests/VoidDetection/CMakeLists.txt @@ -1,10 +1,7 @@ cmake_minimum_required(VERSION 3.14) +project(VoidDetection LANGUAGES CXX) -project("VoidDetection") +add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") +target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_executable(${PROJECT_NAME} ${PROJECT_NAME}.cpp) -target_include_directories(${PROJECT_NAME} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${PROJECT_NAME} PRIVATE ${VIENNALS_LIBRARIES}) - -add_dependencies(buildTests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) From 257e641accf6954731ff5980c61eb7fa016f7f5b Mon Sep 17 00:00:00 2001 From: Curve Date: Tue, 21 Nov 2023 02:02:02 +0100 Subject: [PATCH 04/41] fix: missing include --- include/lsPointData.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/include/lsPointData.hpp b/include/lsPointData.hpp index c07aaa63..7454e2aa 100644 --- a/include/lsPointData.hpp +++ b/include/lsPointData.hpp @@ -4,6 +4,7 @@ #include #include +#include #include #include From bdd32ce1941c0d1d26fc1edad29911963c11ab44 Mon Sep 17 00:00:00 2001 From: Curve Date: Tue, 21 Nov 2023 02:25:26 +0100 Subject: [PATCH 05/41] refactor(cmake): update python bindings --- Python/CMakeLists.txt | 68 ++++++++++++++++++++++--------------------- Python/__init__.py.in | 1 + 2 files changed, 36 insertions(+), 33 deletions(-) diff --git a/Python/CMakeLists.txt b/Python/CMakeLists.txt index eb840b95..3feb3a21 100644 --- a/Python/CMakeLists.txt +++ b/Python/CMakeLists.txt @@ -1,54 +1,56 @@ cmake_minimum_required(VERSION 3.14) +project(ViennaLSPython LANGUAGES CXX) -project(ViennaLSPython) +# -------------------------------------------------------------------------------------------------------- +# Setup Dependencies +# -------------------------------------------------------------------------------------------------------- -include("${CMAKE_SOURCE_DIR}/cmake/prepare.cmake") +include("../cmake/cpm.cmake") -# Point find_package to the binary directory instead of the install location -find_package(ViennaLS REQUIRED PATHS ${ViennaLS_BINARY_DIR} NO_DEFAULT_PATH) +set(PYBIND11_FINDPYTHON ON) +set(PYBIND11_PYTHON_VERSION 3 CACHE STRING "Python version") -list(PREPEND VIENNALS_INCLUDE_DIRS ${VIENNALS_BUILD_INCLUDE_DIRS}) +CPMAddPackage( + NAME pybind11 + VERSION 2.11.1 + GIT_REPOSITORY "https://github.com/pybind/pybind11" +) -message(STATUS "ViennaLS version: ${VIENNALS_VERSION}") +# -------------------------------------------------------------------------------------------------------- +# Constants +# -------------------------------------------------------------------------------------------------------- -set(PYBIND11_PYTHON_VERSION - 3 - CACHE STRING "Python version") +message("${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") -find_package(pybind11 REQUIRED PATHS ${pybind11_DIR} NO_DEFAULT_PATH) - -set(VIENNALS_PYTHON_SOURCE pyWrap.cpp) set(VIENNALS_PYTHON_MODULE_NAME "viennals") -set(VIENNALS_LIBRARY_OUTPUT_DIR ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) +set(VIENNALS_LIBRARY_OUTPUT_DIR ${CMAKE_BINARY_DIR}) -# ################################################################################################## -# BUILD 2D PYTHON LIBRARY -# ################################################################################################## -set(VIENNALS_PYTHON_MODULE_NAME_2D "_${VIENNALS_PYTHON_MODULE_NAME}2d") +# -------------------------------------------------------------------------------------------------------- +# Setup 2D-Bindings +# -------------------------------------------------------------------------------------------------------- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${VIENNALS_LIBRARY_OUTPUT_DIR}/viennals2d) -pybind11_add_module(${VIENNALS_PYTHON_MODULE_NAME_2D} ${VIENNALS_PYTHON_SOURCE}) -target_include_directories(${VIENNALS_PYTHON_MODULE_NAME_2D} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${VIENNALS_PYTHON_MODULE_NAME_2D} PRIVATE ${VIENNALS_LIBRARIES}) -target_compile_definitions( - ${VIENNALS_PYTHON_MODULE_NAME_2D} - PRIVATE -DVIENNALS_PYTHON_DIMENSION=2 -DVIENNALS_MODULE_NAME=${VIENNALS_PYTHON_MODULE_NAME_2D}) +set(VIENNALS_PYTHON_MODULE_NAME_2D "_${VIENNALS_PYTHON_MODULE_NAME}2d") + +pybind11_add_module("${VIENNALS_PYTHON_MODULE_NAME_2D}" "pyWrap.cpp") + +target_link_libraries(${VIENNALS_PYTHON_MODULE_NAME_2D} PUBLIC ViennaLS) +target_compile_definitions(${VIENNALS_PYTHON_MODULE_NAME_2D} PRIVATE -DVIENNALS_PYTHON_DIMENSION=2 -DVIENNALS_MODULE_NAME=${VIENNALS_PYTHON_MODULE_NAME_2D}) set(MODULE_NAME ${VIENNALS_PYTHON_MODULE_NAME_2D}) configure_file(__init__.py.in ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/__init__.py) -# ################################################################################################## -# BUILD 3D PYTHON LIBRARY -# ################################################################################################## -set(VIENNALS_PYTHON_MODULE_NAME_3D "_${VIENNALS_PYTHON_MODULE_NAME}3d") +# -------------------------------------------------------------------------------------------------------- +# Setup 3D-Bindings +# -------------------------------------------------------------------------------------------------------- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${VIENNALS_LIBRARY_OUTPUT_DIR}/viennals3d) -pybind11_add_module(${VIENNALS_PYTHON_MODULE_NAME_3D} ${VIENNALS_PYTHON_SOURCE}) -target_include_directories(${VIENNALS_PYTHON_MODULE_NAME_3D} PUBLIC ${VIENNALS_INCLUDE_DIRS}) -target_link_libraries(${VIENNALS_PYTHON_MODULE_NAME_3D} PRIVATE ${VIENNALS_LIBRARIES}) -target_compile_definitions( - ${VIENNALS_PYTHON_MODULE_NAME_3D} - PRIVATE -DVIENNALS_PYTHON_DIMENSION=3 -DVIENNALS_MODULE_NAME=${VIENNALS_PYTHON_MODULE_NAME_3D}) +set(VIENNALS_PYTHON_MODULE_NAME_3D "_${VIENNALS_PYTHON_MODULE_NAME}3d") + +pybind11_add_module("${VIENNALS_PYTHON_MODULE_NAME_3D}" "pyWrap.cpp") + +target_link_libraries(${VIENNALS_PYTHON_MODULE_NAME_3D} PUBLIC ViennaLS) +target_compile_definitions(${VIENNALS_PYTHON_MODULE_NAME_3D} PRIVATE -DVIENNALS_PYTHON_DIMENSION=3 -DVIENNALS_MODULE_NAME=${VIENNALS_PYTHON_MODULE_NAME_3D}) set(MODULE_NAME ${VIENNALS_PYTHON_MODULE_NAME_3D}) configure_file(__init__.py.in ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/__init__.py) diff --git a/Python/__init__.py.in b/Python/__init__.py.in index fcd3c2b6..b83dac31 100644 --- a/Python/__init__.py.in +++ b/Python/__init__.py.in @@ -7,6 +7,7 @@ topography simulations. The main design goals are simplicity and efficiency, tailored towards scientific simulations. ViennaLS can also be used for visualisation applications, although this is not the main design target. """ + import os import sys From 0d24ce796da262346c541e3244c01240a7dd7322 Mon Sep 17 00:00:00 2001 From: Curve Date: Tue, 21 Nov 2023 12:29:48 +0100 Subject: [PATCH 06/41] feat: add sanitizer options --- CMakeLists.txt | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index bb6cd503..2bfaa702 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,9 @@ option(VIENNALS_USE_VTK "Build with VTK file support" option(VIENNALS_PRECOMPILE_HEADERS "Build template specialisations for shorter compile times" OFF) option(VIENNALS_STATIC_BUILD "Build dependencies as static libraries" OFF) +option(VIENNALS_ENABLE_SANITIZER "Enable Sanitizer for debug buidlds" ON) +option(VIENNALS_USE_SANITIZER "Enable Sanitizer" OFF) + option(VIENNALS_BUILD_EXAMPLES "Build examples" OFF) option(VIENNALS_BUILD_TESTS "Build tests" OFF) @@ -22,7 +25,7 @@ include(CMakeDependentOption) cmake_dependent_option(VIENNALS_BUILD_PYTHON "Build for Python (>=3)" OFF "VIENNALS_USE_VTK" OFF) # -------------------------------------------------------------------------------------------------------- -# Ensure valid options +# Configuration # -------------------------------------------------------------------------------------------------------- if (VIENNALS_STATIC_BUILD) @@ -30,9 +33,17 @@ if (VIENNALS_STATIC_BUILD) set(VIENNALS_PRECOMPILE_HEADERS ON) endif() -# -------------------------------------------------------------------------------------------------------- -# CMake / CPM Options -# -------------------------------------------------------------------------------------------------------- +if ((VIENNALS_ENABLE_SANITIZER AND CMAKE_BUILD_TYPE STREQUAL "Debug") OR VIENNALS_USE_SANITIZER) + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + add_compile_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=thread -fsanitize=memory) + add_link_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=thread -fsanitize=memory) + elseif(MSVC) + add_compile_options(/fsanitize=address /fsanitize-address-use-after-return /fno-sanitize-address-vcasan-lib) + add_link_options(/fsanitize=address /fsanitize-address-use-after-return /fno-sanitize-address-vcasan-lib) + endif() + + message(STATUS "[ViennaLS] Using Sanitizer") +endif() if(MSVC) set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) From b152b49088a68799d4c2e93a270a3cf0a74450ba Mon Sep 17 00:00:00 2001 From: Curve Date: Tue, 21 Nov 2023 12:30:00 +0100 Subject: [PATCH 07/41] feat(cmake): add install target --- CMakeLists.txt | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2bfaa702..62d68aa3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -176,3 +176,19 @@ if (VIENNALS_BUILD_TESTS) enable_testing() add_subdirectory(Tests) endif() + +# -------------------------------------------------------------------------------------------------------- +# Install Target +# -------------------------------------------------------------------------------------------------------- + +install(TARGETS ${PROJECT_NAME} + EXPORT ${PROJECT_NAME}_Targets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +) + +# TOOD: This could be improved if the header files were in a sub-directory + +file(GLOB headers "include/*.hpp") +install(FILES ${headers} DESTINATION include) From 1fddceeefb690db938817aeea4f5a03e608902c8 Mon Sep 17 00:00:00 2001 From: Curve Date: Tue, 21 Nov 2023 12:30:26 +0100 Subject: [PATCH 08/41] refactor(cmake/python): use `CMAKE_LIBRARY_OUTPUT_DIRECTORY` when available --- Python/CMakeLists.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Python/CMakeLists.txt b/Python/CMakeLists.txt index 3feb3a21..1fcd8a6a 100644 --- a/Python/CMakeLists.txt +++ b/Python/CMakeLists.txt @@ -25,6 +25,11 @@ message("${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") set(VIENNALS_PYTHON_MODULE_NAME "viennals") set(VIENNALS_LIBRARY_OUTPUT_DIR ${CMAKE_BINARY_DIR}) +if (CMAKE_LIBRARY_OUTPUT_DIRECTORY) + set(VIENNALS_LIBRARY_OUTPUT_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") + message(STATUS "[ViennaLS] Using Library Output Directory for bindings") +endif() + # -------------------------------------------------------------------------------------------------------- # Setup 2D-Bindings # -------------------------------------------------------------------------------------------------------- From 80d4611c188c240c54a9dd5540e33332030cf38d Mon Sep 17 00:00:00 2001 From: Curve Date: Tue, 21 Nov 2023 17:45:16 +0100 Subject: [PATCH 09/41] feat(cmake): add sanitizer options for gcc --- CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 62d68aa3..2944f7a1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,10 @@ if ((VIENNALS_ENABLE_SANITIZER AND CMAKE_BUILD_TYPE STREQUAL "Debug") OR VIENNAL if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=thread -fsanitize=memory) add_link_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=thread -fsanitize=memory) - elseif(MSVC) + elseif (NOT MSVC) + add_compile_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=thread -fsanitize=leak) + add_link_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=thread -fsanitize=leak) + else() add_compile_options(/fsanitize=address /fsanitize-address-use-after-return /fno-sanitize-address-vcasan-lib) add_link_options(/fsanitize=address /fsanitize-address-use-after-return /fno-sanitize-address-vcasan-lib) endif() From fd458ded12c861d07e1dbc75889c56e511ee9070 Mon Sep 17 00:00:00 2001 From: Curve Date: Tue, 21 Nov 2023 17:45:31 +0100 Subject: [PATCH 10/41] fix(cmake): static builds --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2944f7a1..a6609db0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -31,6 +31,7 @@ cmake_dependent_option(VIENNALS_BUILD_PYTHON "Build for Python (>=3)" OFF "VIENN if (VIENNALS_STATIC_BUILD) message(STATUS "[ViennaLS] Enabling precompiled headers for static build") set(VIENNALS_PRECOMPILE_HEADERS ON) + set(BUILD_SHARED_LIBS OFF) endif() if ((VIENNALS_ENABLE_SANITIZER AND CMAKE_BUILD_TYPE STREQUAL "Debug") OR VIENNALS_USE_SANITIZER) From 1926d32496a559e3947efeaaa671c8d75587d629 Mon Sep 17 00:00:00 2001 From: Curve Date: Tue, 21 Nov 2023 17:45:45 +0100 Subject: [PATCH 11/41] refactor(cmake): add messages --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index a6609db0..2d2bead4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -161,6 +161,7 @@ endif() # -------------------------------------------------------------------------------------------------------- if (VIENNALS_BUILD_PYTHON) + message(STATUS "[ViennaLS] Building Python Bindings") add_subdirectory(Python) endif() @@ -169,6 +170,7 @@ endif() # -------------------------------------------------------------------------------------------------------- if (VIENNALS_BUILD_EXAMPLES) + message(STATUS "[ViennaLS] Building Examples") add_subdirectory(Examples) endif() @@ -177,6 +179,8 @@ endif() # -------------------------------------------------------------------------------------------------------- if (VIENNALS_BUILD_TESTS) + message(STATUS "[ViennaLS] Building Tests") + enable_testing() add_subdirectory(Tests) endif() From 36fa52d1c7c3bcfe5880ef70a189c72c6da070e6 Mon Sep 17 00:00:00 2001 From: Curve Date: Tue, 21 Nov 2023 18:18:14 +0100 Subject: [PATCH 12/41] fix(format-project): shellcheck issues --- format-project.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/format-project.sh b/format-project.sh index c0546001..a4f19b3f 100755 --- a/format-project.sh +++ b/format-project.sh @@ -3,10 +3,11 @@ # note: if you aliased clang-format, invoke this script using # bash -i format-project.sh -find . -type d \( -path ./dependencies -o -path ./build* \) -prune -false -o -name "*.hpp" -o -name "*.cpp" | while read -r i; do echo $i; clang-format -i "$i"; done +find . -type d \( -path ./dependencies -o -path "./build*" \) -prune -false -o -name "*.hpp" -o -name "*.cpp" | while read -r i; do echo "$i"; clang-format -i "$i"; done # cmake-format can be installed with `pip install --upgrade cmake-format` + if command -v cmake-format &> /dev/null then - find . -type d \( -path ./dependencies -o -path ./build* \) -prune -false -o -name *.cmake -o -name CMakeLists.txt -o -name *.cmake.in | while read -r i; do echo $i; cmake-format --line-width 100 -i "$i"; done + find . -type d \( -path ./dependencies -o -path "./build*" \) -prune -false -o -name "*.cmake" -o -name CMakeLists.txt -o -name "*.cmake.in" | while read -r i; do echo "$i"; cmake-format --line-width 100 -i "$i"; done fi From 396c57e35c89fe22a223873483678a241564dcbe Mon Sep 17 00:00:00 2001 From: Curve Date: Wed, 22 Nov 2023 10:42:39 +0100 Subject: [PATCH 13/41] refactor(cmake/sanitizer): more explicit compiler id check --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d2bead4..3d972fa9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,10 +38,10 @@ if ((VIENNALS_ENABLE_SANITIZER AND CMAKE_BUILD_TYPE STREQUAL "Debug") OR VIENNAL if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") add_compile_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=thread -fsanitize=memory) add_link_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=thread -fsanitize=memory) - elseif (NOT MSVC) + elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU") add_compile_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=thread -fsanitize=leak) add_link_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=thread -fsanitize=leak) - else() + elseif(MSVC) add_compile_options(/fsanitize=address /fsanitize-address-use-after-return /fno-sanitize-address-vcasan-lib) add_link_options(/fsanitize=address /fsanitize-address-use-after-return /fno-sanitize-address-vcasan-lib) endif() From 1b96dced8410c9212dd29fdeb5007acbd97b3e1f Mon Sep 17 00:00:00 2001 From: Curve Date: Mon, 27 Nov 2023 21:49:09 +0100 Subject: [PATCH 14/41] fix: update formatting --- include/lsFromSurfaceMesh.hpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/include/lsFromSurfaceMesh.hpp b/include/lsFromSurfaceMesh.hpp index 3f72c302..1e3f63b0 100644 --- a/include/lsFromSurfaceMesh.hpp +++ b/include/lsFromSurfaceMesh.hpp @@ -216,11 +216,10 @@ template class lsFromSurfaceMesh { lsFromSurfaceMesh(lsSmartPointer> passedLevelSet, lsSmartPointer> passedMesh, bool passedRemoveBoundaryTriangles = true) - : levelSet(passedLevelSet), - mesh(passedMesh), removeBoundaryTriangles{ - passedRemoveBoundaryTriangles, - passedRemoveBoundaryTriangles, - passedRemoveBoundaryTriangles} {} + : levelSet(passedLevelSet), mesh(passedMesh), + removeBoundaryTriangles{passedRemoveBoundaryTriangles, + passedRemoveBoundaryTriangles, + passedRemoveBoundaryTriangles} {} void setLevelSet(lsSmartPointer> passedLevelSet) { levelSet = passedLevelSet; From 1032eb6c738d1604faad816fecd6defadc216130 Mon Sep 17 00:00:00 2001 From: Curve Date: Mon, 27 Nov 2023 22:06:43 +0100 Subject: [PATCH 15/41] fix(workflows): build commands --- .github/workflows/linux_test.yml | 10 ++++------ .github/workflows/macos_test.yml | 9 +++------ .github/workflows/windows_test.yml | 10 ++++------ 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/.github/workflows/linux_test.yml b/.github/workflows/linux_test.yml index f8716a99..034a71a3 100644 --- a/.github/workflows/linux_test.yml +++ b/.github/workflows/linux_test.yml @@ -31,15 +31,12 @@ jobs: - name: Configure run: | - cmake -B ./build \ + cmake -B build \ -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ -D VIENNALS_BUILD_TESTS=ON - - name: Build Dependencies - run: cmake --build ./build --target buildDependencies - - name: Build Tests - run: cmake --build ./build --target buildTests + run: cmake --build build - name: Run Tests working-directory: ${{github.workspace}}/build @@ -53,6 +50,7 @@ jobs: token: ${{ secrets.PAT_VIENNAPS }} repository: ${{github.repository_owner}}/ViennaPS event-type: viennals-update-linux + linux-python: runs-on: ubuntu-latest steps: @@ -65,7 +63,7 @@ jobs: with: key: viennals-dependency-cache-${{ runner.os }}-${{env.BUILD_TYPE}}-${{ hashFiles( './external/upstream/**CMakeLists.txt' ) }} path: ${{github.workspace}}/dependencies/Install - + - name: Build and install Python module shell: bash run: pip3 install --user . -v diff --git a/.github/workflows/macos_test.yml b/.github/workflows/macos_test.yml index ab95cfef..f0955a7b 100644 --- a/.github/workflows/macos_test.yml +++ b/.github/workflows/macos_test.yml @@ -32,7 +32,7 @@ jobs: - name: Configure run: | - cmake -B ./build \ + cmake -B build \ -D CMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} \ -D VIENNALS_BUILD_TESTS=ON \ -D OpenMP_C_FLAGS="-Xpreprocessor -fopenmp -I$(brew --prefix libomp)/include" \ @@ -41,11 +41,8 @@ jobs: -D OpenMP_CXX_LIB_NAMES="omp" \ -D OpenMP_omp_LIBRARY="$(brew --prefix libomp)/lib/libomp.a" - - name: Build Dependencies - run: cmake --build ./build --target buildDependencies - - - name: Build Tests - run: cmake --build ./build --target buildTests + - name: Build + run: cmake --build build - name: Run Tests working-directory: ${{github.workspace}}/build diff --git a/.github/workflows/windows_test.yml b/.github/workflows/windows_test.yml index d1be4573..36324b68 100644 --- a/.github/workflows/windows_test.yml +++ b/.github/workflows/windows_test.yml @@ -33,11 +33,8 @@ jobs: - name: Configure run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DVIENNALS_BUILD_TESTS=ON - - name: Build Dependencies - run: cmake --build ${{github.workspace}}/build --target buildDependencies - - - name: Build Tests - run: cmake --build ${{github.workspace}}/build --target buildTests + - name: Build + run: cmake --build ${{github.workspace}}/build - name: Add VTK to PATH run: echo "${{github.workspace}}\dependencies\Install\vtk_external\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append @@ -54,6 +51,7 @@ jobs: token: ${{ secrets.PAT_VIENNAPS }} repository: ${{github.repository_owner}}/ViennaPS event-type: viennals-update-windows + windows-python: runs-on: windows-latest @@ -70,4 +68,4 @@ jobs: - name: Build and install Python module shell: bash - run: pip3 install --user . -v \ No newline at end of file + run: pip3 install --user . -v From e972ef231f8ebd965404f01f27352808cc794be2 Mon Sep 17 00:00:00 2001 From: Curve Date: Mon, 27 Nov 2023 22:06:54 +0100 Subject: [PATCH 16/41] fix(workflows(windows): long paths --- .github/workflows/windows_test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/windows_test.yml b/.github/workflows/windows_test.yml index 36324b68..6c98af2c 100644 --- a/.github/workflows/windows_test.yml +++ b/.github/workflows/windows_test.yml @@ -30,6 +30,11 @@ jobs: key: viennals-dependency-cache-${{ runner.os }}-${{env.BUILD_TYPE}}-${{ hashFiles( './external/upstream/**CMakeLists.txt' ) }} path: ${{github.workspace}}/dependencies/Install + - name: Configure Git + # Workaround for windows, as the filename is 260 by default, however + # VTK has some files that exceed this limit, thus we need this workaround. + run: git config --system core.longpaths true + - name: Configure run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DVIENNALS_BUILD_TESTS=ON From 74df39ca8c031db8c2c21062e7d28e19b6a8ef48 Mon Sep 17 00:00:00 2001 From: Curve Date: Mon, 27 Nov 2023 22:07:10 +0100 Subject: [PATCH 17/41] fix(CMakeLists): disable VTK rendering group --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3d972fa9..4692a742 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -100,6 +100,12 @@ if (VIENNALS_USE_VTK) GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk" OPTIONS "VTK_LEGACY_REMOVE ON" "VTK_SMP_IMPLEMENTATION_TYPE \"OpenMP\"" + "VTK_GROUP_ENABLE_Rendering NO" + "VTK_GROUP_ENABLE_Imaging NO" + "VTK_GROUP_ENABLE_Views NO" + "TK_GROUP_ENABLE_Web NO" + "VTK_GROUP_ENABLE_Qt NO" + "VTK_GROUP_ENABLE_MPI NO" "VTK_MODULE_ENABLE_VTK_CommonExecutionModel YES" "VTK_MODULE_ENABLE_VTK_CommonMisc YES" "VTK_MODULE_ENABLE_VTK_CommonSystem YES" From 9c40d8a0f7f28a08d7a6326492d83bd8b498b733 Mon Sep 17 00:00:00 2001 From: Curve Date: Mon, 27 Nov 2023 22:07:25 +0100 Subject: [PATCH 18/41] docs(readme): update build instructions --- README.md | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index d8078da0..fa83503e 100644 --- a/README.md +++ b/README.md @@ -52,10 +52,9 @@ However, we recommend the following procedure in order to set up all dependencie ```bash git clone https://github.com/ViennaTools/ViennaLS.git cd ViennaLS -mkdir build && cd build -cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/your/custom/install/ -make buildDependencies # this will install all dependencies and might take a while -make install + +cmake -B build -DCMAKE_INSTALL_PREFIX=/path/to/your/custom/install/ +cmake --build build ``` This will install the necessary headers and CMake files to the specified path. If DCMAKE_INSTALL_PREFIX is not specified, it will be installed to the standard path for your system, usually /usr/local/ . @@ -66,10 +65,9 @@ In order to install ViennaLS without VTK, run: ```bash git clone https://github.com/ViennaTools/ViennaLS.git cd ViennaLS -mkdir build && cd build -cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/your/custom/install/ -DVIENNALS_USE_VTK=OFF -make buildDependencies -make install + +cmake -B build -DCMAKE_INSTALL_PREFIX=/path/to/your/custom/install/ -DVIENNALS_USE_VTK=OFF +cmake --build build ``` ## Installing with dependencies already installed on the system @@ -79,10 +77,9 @@ The CMake configuration automatically checks if the dependencies are installed. ```bash git clone https://github.com/ViennaTools/ViennaLS.git cd ViennaLS -mkdir build && cd build -cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/your/custom/install/ -make buildDependencies -make install + +cmake -B build -DCMAKE_INSTALL_PREFIX=/path/to/your/custom/install/ +cmake --build build ``` If one wants to use a specific installation of one or more of the dependencies, just pass the corresponding _*_DIR_ variable as a configuration option (e.g. -DVTK_DIR=/path/to/vtk/install -Dpybind11_DIR=/path/to/pybind11 -DViennaHRLE_DIR=/path/to/viennahrle) @@ -136,10 +133,10 @@ In order to check whether ViennaLS runs without issues on your system, you can r ```bash git clone https://github.com/ViennaTools/ViennaLS.git cd ViennaLS -mkdir build && cd build -cmake .. -DVIENNALS_BUILD_TESTS=ON -make buildTests # build all tests -make test # run all tests + +cmake -B build -DVIENNALS_BUILD_TESTS=ON +cmake --build build +ctest -LE '^benchmark$' ``` ## Building examples @@ -147,8 +144,8 @@ make test # run all tests The examples can be built using CMake: ```bash -cmake .. -DVIENNALS_BUILD_EXAMPLES=ON -make buildExamples +cmake -B build -DVIENNALS_BUILD_EXAMPLES=ON +cmake --build build ``` ## Integration in CMake projects From 3ca2284cc9e37c0ff9cc78c3194069ea17e02792 Mon Sep 17 00:00:00 2001 From: Curve Date: Mon, 27 Nov 2023 22:39:48 +0100 Subject: [PATCH 19/41] docs(readme): fix test command --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index fa83503e..85e0b2f9 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ cd ViennaLS cmake -B build -DVIENNALS_BUILD_TESTS=ON cmake --build build -ctest -LE '^benchmark$' +ctest -LE '^benchmark$' --test-dir build ``` ## Building examples From 7757f396af204ab63ec1afccd0c2052c51e39dd3 Mon Sep 17 00:00:00 2001 From: Curve Date: Mon, 27 Nov 2023 22:45:28 +0100 Subject: [PATCH 20/41] fix: ctest excludes --- .github/workflows/linux_test.yml | 2 +- .github/workflows/macos_test.yml | 2 +- .github/workflows/windows_test.yml | 2 +- README.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/linux_test.yml b/.github/workflows/linux_test.yml index 034a71a3..102015ea 100644 --- a/.github/workflows/linux_test.yml +++ b/.github/workflows/linux_test.yml @@ -41,7 +41,7 @@ jobs: - name: Run Tests working-directory: ${{github.workspace}}/build # Run all tests that are not labeled as benchmark - run: ctest -LE '^benchmark$' + run: ctest -E "Benchmark|Performance" - name: Trigger Action on ViennaPS Repository if: ${{ vars.TRIGGER_VIENNAPS == 'true' && github.event_name != 'schedule' && github.event_name != 'pull_request' }} diff --git a/.github/workflows/macos_test.yml b/.github/workflows/macos_test.yml index f0955a7b..4c427b93 100644 --- a/.github/workflows/macos_test.yml +++ b/.github/workflows/macos_test.yml @@ -47,7 +47,7 @@ jobs: - name: Run Tests working-directory: ${{github.workspace}}/build # Run all tests that are not labeled as benchmark - run: ctest -LE '^benchmark$' + run: ctest -E "Benchmark|Performance" - name: Trigger Action on ViennaPS Repository if: ${{ vars.TRIGGER_VIENNAPS == 'true' && github.event_name != 'schedule' && github.event_name != 'pull_request' }} diff --git a/.github/workflows/windows_test.yml b/.github/workflows/windows_test.yml index 6c98af2c..b0a807aa 100644 --- a/.github/workflows/windows_test.yml +++ b/.github/workflows/windows_test.yml @@ -47,7 +47,7 @@ jobs: - name: Run Tests working-directory: ${{github.workspace}}/build # Run all tests except those that are labeled as benchmark - run: ctest -LE "^benchmark$" -j 2 --output-on-failure --timeout 1800 -C ${{env.BUILD_TYPE}} + run: ctest -E "Benchmark|Performance" -j 2 --output-on-failure --timeout 1800 -C ${{env.BUILD_TYPE}} - name: Trigger Action on ViennaPS Repository if: ${{ vars.TRIGGER_VIENNAPS == 'true' && github.event_name != 'schedule' && github.event_name != 'pull_request' }} diff --git a/README.md b/README.md index 85e0b2f9..afde9752 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ cd ViennaLS cmake -B build -DVIENNALS_BUILD_TESTS=ON cmake --build build -ctest -LE '^benchmark$' --test-dir build +ctest -E "Benchmark|Performance" --test-dir build ``` ## Building examples From 6b062d691d9a36a02dae1f847d509d75d58e4960 Mon Sep 17 00:00:00 2001 From: Curve Date: Wed, 29 Nov 2023 09:02:16 +0100 Subject: [PATCH 21/41] refactor: disable sanitizer for msvc and apple clang --- CMakeLists.txt | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4692a742..a3853eb4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ option(VIENNALS_PRECOMPILE_HEADERS "Build template specialisations for shorter option(VIENNALS_STATIC_BUILD "Build dependencies as static libraries" OFF) option(VIENNALS_ENABLE_SANITIZER "Enable Sanitizer for debug buidlds" ON) -option(VIENNALS_USE_SANITIZER "Enable Sanitizer" OFF) +option(VIENNALS_USE_SANITIZER "Enable Sanitizer (Requires GCC or Clang)" OFF) option(VIENNALS_BUILD_EXAMPLES "Build examples" OFF) option(VIENNALS_BUILD_TESTS "Build tests" OFF) @@ -35,15 +35,12 @@ if (VIENNALS_STATIC_BUILD) endif() if ((VIENNALS_ENABLE_SANITIZER AND CMAKE_BUILD_TYPE STREQUAL "Debug") OR VIENNALS_USE_SANITIZER) - if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") - add_compile_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=thread -fsanitize=memory) - add_link_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=thread -fsanitize=memory) - elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU") - add_compile_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=thread -fsanitize=leak) - add_link_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=thread -fsanitize=leak) - elseif(MSVC) - add_compile_options(/fsanitize=address /fsanitize-address-use-after-return /fno-sanitize-address-vcasan-lib) - add_link_options(/fsanitize=address /fsanitize-address-use-after-return /fno-sanitize-address-vcasan-lib) + if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + add_compile_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=memory) + add_link_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=memory) + elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + add_compile_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=leak) + add_link_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=leak) endif() message(STATUS "[ViennaLS] Using Sanitizer") From 94f394503fff3a8dd819ecba7932b7ca20b11e9f Mon Sep 17 00:00:00 2001 From: Curve Date: Wed, 29 Nov 2023 09:04:06 +0100 Subject: [PATCH 22/41] chore: apply cmake-format --- CMakeLists.txt | 165 ++++++++++++----------- Examples/CMakeLists.txt | 11 +- Python/CMakeLists.txt | 20 +-- Tests/CMakeLists.txt | 11 +- cmake/cpm.cmake | 286 +++++++++++++++------------------------- 5 files changed, 218 insertions(+), 275 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a3853eb4..e9bdd8e6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,20 +1,23 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR) -project(ViennaLS LANGUAGES CXX VERSION 2.1.0) +project( + ViennaLS + LANGUAGES CXX + VERSION 2.1.0) # -------------------------------------------------------------------------------------------------------- # Library options # -------------------------------------------------------------------------------------------------------- -option(VIENNALS_USE_VTK "Build with VTK file support" ON) +option(VIENNALS_USE_VTK "Build with VTK file support" ON) -option(VIENNALS_PRECOMPILE_HEADERS "Build template specialisations for shorter compile times" OFF) -option(VIENNALS_STATIC_BUILD "Build dependencies as static libraries" OFF) +option(VIENNALS_PRECOMPILE_HEADERS "Build template specialisations for shorter compile times" OFF) +option(VIENNALS_STATIC_BUILD "Build dependencies as static libraries" OFF) -option(VIENNALS_ENABLE_SANITIZER "Enable Sanitizer for debug buidlds" ON) -option(VIENNALS_USE_SANITIZER "Enable Sanitizer (Requires GCC or Clang)" OFF) +option(VIENNALS_ENABLE_SANITIZER "Enable Sanitizer for debug buidlds" ON) +option(VIENNALS_USE_SANITIZER "Enable Sanitizer (Requires GCC or Clang)" OFF) -option(VIENNALS_BUILD_EXAMPLES "Build examples" OFF) -option(VIENNALS_BUILD_TESTS "Build tests" OFF) +option(VIENNALS_BUILD_EXAMPLES "Build examples" OFF) +option(VIENNALS_BUILD_TESTS "Build tests" OFF) # -------------------------------------------------------------------------------------------------------- # Conditional Library options @@ -28,17 +31,17 @@ cmake_dependent_option(VIENNALS_BUILD_PYTHON "Build for Python (>=3)" OFF "VIENN # Configuration # -------------------------------------------------------------------------------------------------------- -if (VIENNALS_STATIC_BUILD) +if(VIENNALS_STATIC_BUILD) message(STATUS "[ViennaLS] Enabling precompiled headers for static build") set(VIENNALS_PRECOMPILE_HEADERS ON) set(BUILD_SHARED_LIBS OFF) endif() -if ((VIENNALS_ENABLE_SANITIZER AND CMAKE_BUILD_TYPE STREQUAL "Debug") OR VIENNALS_USE_SANITIZER) - if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") +if((VIENNALS_ENABLE_SANITIZER AND CMAKE_BUILD_TYPE STREQUAL "Debug") OR VIENNALS_USE_SANITIZER) + if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") add_compile_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=memory) add_link_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=memory) - elseif (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") + elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") add_compile_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=leak) add_link_options(-fno-omit-frame-pointer -fsanitize=address -fsanitize=leak) endif() @@ -60,11 +63,15 @@ add_library(${PROJECT_NAME} INTERFACE) add_library(ViennaTools::${PROJECT_NAME} ALIAS ${PROJECT_NAME}) target_compile_features(${PROJECT_NAME} INTERFACE cxx_std_17) -set_target_properties(${PROJECT_NAME} PROPERTIES CXX_STANDARD 17 CXX_EXTENSIONS OFF CXX_STANDARD_REQUIRED ON) +set_target_properties( + ${PROJECT_NAME} + PROPERTIES CXX_STANDARD 17 + CXX_EXTENSIONS OFF + CXX_STANDARD_REQUIRED ON) -if (MSVC) - # https://learn.microsoft.com/cpp/c-runtime-library/math-constants - # TODO: In case C++20 is adpoted any time soon: https://cppreference.com/w/cpp/numeric/constants +if(MSVC) + # https://learn.microsoft.com/cpp/c-runtime-library/math-constants TODO: In case C++20 is adpoted + # any time soon: https://cppreference.com/w/cpp/numeric/constants target_compile_definitions(${PROJECT_NAME} INTERFACE _USE_MATH_DEFINES=1) endif() @@ -81,62 +88,62 @@ target_include_directories(${PROJECT_NAME} INTERFACE "include") include("cmake/cpm.cmake") -CPMAddPackage( - NAME ViennaHRLE - GIT_TAG master - GIT_REPOSITORY "https://github.com/ViennaTools/ViennaHRLE" -) +cpmaddpackage(NAME ViennaHRLE GIT_TAG master GIT_REPOSITORY + "https://github.com/ViennaTools/ViennaHRLE") find_package(OpenMP REQUIRED) target_link_libraries(${PROJECT_NAME} INTERFACE OpenMP::OpenMP_CXX ViennaHRLE) -if (VIENNALS_USE_VTK) - CPMAddPackage( - NAME VTK - VERSION 9.3.0 - GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk" - OPTIONS "VTK_LEGACY_REMOVE ON" - "VTK_SMP_IMPLEMENTATION_TYPE \"OpenMP\"" - "VTK_GROUP_ENABLE_Rendering NO" - "VTK_GROUP_ENABLE_Imaging NO" - "VTK_GROUP_ENABLE_Views NO" - "TK_GROUP_ENABLE_Web NO" - "VTK_GROUP_ENABLE_Qt NO" - "VTK_GROUP_ENABLE_MPI NO" - "VTK_MODULE_ENABLE_VTK_CommonExecutionModel YES" - "VTK_MODULE_ENABLE_VTK_CommonMisc YES" - "VTK_MODULE_ENABLE_VTK_CommonSystem YES" - "VTK_MODULE_ENABLE_VTK_CommonMath YES" - "VTK_MODULE_ENABLE_VTK_CommonCore YES" - "VTK_MODULE_ENABLE_VTK_CommonTransforms YES" - "VTK_MODULE_ENABLE_VTK_CommonComputationalGeometry YES" - "VTK_MODULE_ENABLE_VTK_IOCore YES" - "VTK_MODULE_ENABLE_VTK_IOXMLParser YES" - "VTK_MODULE_ENABLE_VTK_IOXML YES" - "VTK_MODULE_ENABLE_VTK_FiltersCore YES" - "VTK_MODULE_ENABLE_VTK_FiltersGeneral YES" - "VTK_MODULE_ENABLE_VTK_FiltersGeometry YES" - ) +if(VIENNALS_USE_VTK) + cpmaddpackage( + NAME + VTK + VERSION + 9.3.0 + GIT_REPOSITORY + "https://gitlab.kitware.com/vtk/vtk" + OPTIONS + "VTK_LEGACY_REMOVE ON" + "VTK_SMP_IMPLEMENTATION_TYPE \"OpenMP\"" + "VTK_GROUP_ENABLE_Rendering NO" + "VTK_GROUP_ENABLE_Imaging NO" + "VTK_GROUP_ENABLE_Views NO" + "TK_GROUP_ENABLE_Web NO" + "VTK_GROUP_ENABLE_Qt NO" + "VTK_GROUP_ENABLE_MPI NO" + "VTK_MODULE_ENABLE_VTK_CommonExecutionModel YES" + "VTK_MODULE_ENABLE_VTK_CommonMisc YES" + "VTK_MODULE_ENABLE_VTK_CommonSystem YES" + "VTK_MODULE_ENABLE_VTK_CommonMath YES" + "VTK_MODULE_ENABLE_VTK_CommonCore YES" + "VTK_MODULE_ENABLE_VTK_CommonTransforms YES" + "VTK_MODULE_ENABLE_VTK_CommonComputationalGeometry YES" + "VTK_MODULE_ENABLE_VTK_IOCore YES" + "VTK_MODULE_ENABLE_VTK_IOXMLParser YES" + "VTK_MODULE_ENABLE_VTK_IOXML YES" + "VTK_MODULE_ENABLE_VTK_FiltersCore YES" + "VTK_MODULE_ENABLE_VTK_FiltersGeneral YES" + "VTK_MODULE_ENABLE_VTK_FiltersGeometry YES") target_compile_definitions(${PROJECT_NAME} INTERFACE VIENNALS_USE_VTK=1) - - target_link_libraries(${PROJECT_NAME} INTERFACE - VTK::CommonExecutionModel - VTK::CommonMisc - VTK::CommonSystem - VTK::CommonMath - VTK::CommonCore - VTK::CommonTransforms - VTK::CommonComputationalGeometry - VTK::IOCore - VTK::IOXMLParser - VTK::IOXML - VTK::FiltersCore - VTK::FiltersGeneral - VTK::FiltersGeometry - ) - - if (NOT VTK_DIR) + + target_link_libraries( + ${PROJECT_NAME} + INTERFACE VTK::CommonExecutionModel + VTK::CommonMisc + VTK::CommonSystem + VTK::CommonMath + VTK::CommonCore + VTK::CommonTransforms + VTK::CommonComputationalGeometry + VTK::IOCore + VTK::IOXMLParser + VTK::IOXML + VTK::FiltersCore + VTK::FiltersGeneral + VTK::FiltersGeometry) + + if(NOT VTK_DIR) set(VTK_DIR "${VTK_BINARY_DIR}/lib") endif() endif() @@ -145,16 +152,16 @@ endif() # Setup Shared/Static Library # -------------------------------------------------------------------------------------------------------- -if (VIENNALS_PRECOMPILE_HEADERS) +if(VIENNALS_PRECOMPILE_HEADERS) set(VIENNALS_LINKAGE SHARED) - if (VIENNALS_STATIC_BUILD) + if(VIENNALS_STATIC_BUILD) set(VIENNALS_LINKAGE STATIC) endif() add_library(${PROJECT_NAME}Lib ${VIENNALS_LINKAGE}) add_library(${PROJECT_NAME}::Lib ALIAS ${PROJECT_NAME}Lib) - + target_link_libraries(${PROJECT_NAME}Lib PUBLIC ${PROJECT_NAME}) target_sources(${PROJECT_NAME}Lib PUBLIC "lib/specialisations.cpp") endif() @@ -163,7 +170,7 @@ endif() # Setup Python Bindings # -------------------------------------------------------------------------------------------------------- -if (VIENNALS_BUILD_PYTHON) +if(VIENNALS_BUILD_PYTHON) message(STATUS "[ViennaLS] Building Python Bindings") add_subdirectory(Python) endif() @@ -172,7 +179,7 @@ endif() # Setup Examples # -------------------------------------------------------------------------------------------------------- -if (VIENNALS_BUILD_EXAMPLES) +if(VIENNALS_BUILD_EXAMPLES) message(STATUS "[ViennaLS] Building Examples") add_subdirectory(Examples) endif() @@ -181,23 +188,23 @@ endif() # Setup Tests # -------------------------------------------------------------------------------------------------------- -if (VIENNALS_BUILD_TESTS) +if(VIENNALS_BUILD_TESTS) message(STATUS "[ViennaLS] Building Tests") enable_testing() add_subdirectory(Tests) endif() - + # -------------------------------------------------------------------------------------------------------- # Install Target # -------------------------------------------------------------------------------------------------------- -install(TARGETS ${PROJECT_NAME} - EXPORT ${PROJECT_NAME}_Targets - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} - ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} - RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} -) +install( + TARGETS ${PROJECT_NAME} + EXPORT ${PROJECT_NAME}_Targets + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) # TOOD: This could be improved if the header files were in a sub-directory diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 12f53f57..6f0a173a 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -1,9 +1,12 @@ -file(GLOB entries LIST_DIRECTORIES true "*") +file( + GLOB entries + LIST_DIRECTORIES true + "*") foreach(entry ${entries}) - IF(NOT IS_DIRECTORY ${entry}) - CONTINUE() - ENDIF() + if(NOT IS_DIRECTORY ${entry}) + continue() + endif() add_subdirectory(${entry}) endforeach() diff --git a/Python/CMakeLists.txt b/Python/CMakeLists.txt index 1fcd8a6a..f278a697 100644 --- a/Python/CMakeLists.txt +++ b/Python/CMakeLists.txt @@ -8,13 +8,11 @@ project(ViennaLSPython LANGUAGES CXX) include("../cmake/cpm.cmake") set(PYBIND11_FINDPYTHON ON) -set(PYBIND11_PYTHON_VERSION 3 CACHE STRING "Python version") +set(PYBIND11_PYTHON_VERSION + 3 + CACHE STRING "Python version") -CPMAddPackage( - NAME pybind11 - VERSION 2.11.1 - GIT_REPOSITORY "https://github.com/pybind/pybind11" -) +cpmaddpackage(NAME pybind11 VERSION 2.11.1 GIT_REPOSITORY "https://github.com/pybind/pybind11") # -------------------------------------------------------------------------------------------------------- # Constants @@ -25,7 +23,7 @@ message("${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") set(VIENNALS_PYTHON_MODULE_NAME "viennals") set(VIENNALS_LIBRARY_OUTPUT_DIR ${CMAKE_BINARY_DIR}) -if (CMAKE_LIBRARY_OUTPUT_DIRECTORY) +if(CMAKE_LIBRARY_OUTPUT_DIRECTORY) set(VIENNALS_LIBRARY_OUTPUT_DIR "${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") message(STATUS "[ViennaLS] Using Library Output Directory for bindings") endif() @@ -40,7 +38,9 @@ set(VIENNALS_PYTHON_MODULE_NAME_2D "_${VIENNALS_PYTHON_MODULE_NAME}2d") pybind11_add_module("${VIENNALS_PYTHON_MODULE_NAME_2D}" "pyWrap.cpp") target_link_libraries(${VIENNALS_PYTHON_MODULE_NAME_2D} PUBLIC ViennaLS) -target_compile_definitions(${VIENNALS_PYTHON_MODULE_NAME_2D} PRIVATE -DVIENNALS_PYTHON_DIMENSION=2 -DVIENNALS_MODULE_NAME=${VIENNALS_PYTHON_MODULE_NAME_2D}) +target_compile_definitions( + ${VIENNALS_PYTHON_MODULE_NAME_2D} + PRIVATE -DVIENNALS_PYTHON_DIMENSION=2 -DVIENNALS_MODULE_NAME=${VIENNALS_PYTHON_MODULE_NAME_2D}) set(MODULE_NAME ${VIENNALS_PYTHON_MODULE_NAME_2D}) configure_file(__init__.py.in ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/__init__.py) @@ -55,7 +55,9 @@ set(VIENNALS_PYTHON_MODULE_NAME_3D "_${VIENNALS_PYTHON_MODULE_NAME}3d") pybind11_add_module("${VIENNALS_PYTHON_MODULE_NAME_3D}" "pyWrap.cpp") target_link_libraries(${VIENNALS_PYTHON_MODULE_NAME_3D} PUBLIC ViennaLS) -target_compile_definitions(${VIENNALS_PYTHON_MODULE_NAME_3D} PRIVATE -DVIENNALS_PYTHON_DIMENSION=3 -DVIENNALS_MODULE_NAME=${VIENNALS_PYTHON_MODULE_NAME_3D}) +target_compile_definitions( + ${VIENNALS_PYTHON_MODULE_NAME_3D} + PRIVATE -DVIENNALS_PYTHON_DIMENSION=3 -DVIENNALS_MODULE_NAME=${VIENNALS_PYTHON_MODULE_NAME_3D}) set(MODULE_NAME ${VIENNALS_PYTHON_MODULE_NAME_3D}) configure_file(__init__.py.in ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/__init__.py) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 12f53f57..6f0a173a 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1,9 +1,12 @@ -file(GLOB entries LIST_DIRECTORIES true "*") +file( + GLOB entries + LIST_DIRECTORIES true + "*") foreach(entry ${entries}) - IF(NOT IS_DIRECTORY ${entry}) - CONTINUE() - ENDIF() + if(NOT IS_DIRECTORY ${entry}) + continue() + endif() add_subdirectory(${entry}) endforeach() diff --git a/cmake/cpm.cmake b/cmake/cpm.cmake index 7ffb16b6..f6fac70d 100644 --- a/cmake/cpm.cmake +++ b/cmake/cpm.cmake @@ -32,8 +32,7 @@ cmake_minimum_required(VERSION 3.14 FATAL_ERROR) if(NOT CPM_INDENT) set(CPM_INDENT "CPM:" - CACHE INTERNAL "" - ) + CACHE INTERNAL "") endif() if(NOT COMMAND cpm_message) @@ -53,8 +52,7 @@ if(CPM_DIRECTORY) "${CPM_INDENT} \ A dependency is using a more recent CPM version (${CURRENT_CPM_VERSION}) than the current project (${CPM_VERSION}). \ It is recommended to upgrade CPM to the most recent version. \ -See https://github.com/cpm-cmake/CPM.cmake for more information." - ) +See https://github.com/cpm-cmake/CPM.cmake for more information.") endif() if(${CMAKE_VERSION} VERSION_LESS "3.17.0") include(FetchContent) @@ -65,8 +63,7 @@ See https://github.com/cpm-cmake/CPM.cmake for more information." get_property( CPM_INITIALIZED GLOBAL "" PROPERTY CPM_INITIALIZED - SET - ) + SET) if(CPM_INITIALIZED) return() endif() @@ -76,8 +73,7 @@ if(CURRENT_CPM_VERSION MATCHES "development-version") message( WARNING "${CPM_INDENT} Your project is using an unstable development version of CPM.cmake. \ Please update to a recent release if possible. \ -See https://github.com/cpm-cmake/CPM.cmake for details." - ) +See https://github.com/cpm-cmake/CPM.cmake for details.") endif() set_property(GLOBAL PROPERTY CPM_INITIALIZED true) @@ -103,47 +99,36 @@ endmacro() cpm_set_policies() option(CPM_USE_LOCAL_PACKAGES "Always try to use `find_package` to get dependencies" - $ENV{CPM_USE_LOCAL_PACKAGES} -) + $ENV{CPM_USE_LOCAL_PACKAGES}) option(CPM_LOCAL_PACKAGES_ONLY "Only use `find_package` to get dependencies" - $ENV{CPM_LOCAL_PACKAGES_ONLY} -) + $ENV{CPM_LOCAL_PACKAGES_ONLY}) option(CPM_DOWNLOAD_ALL "Always download dependencies from source" $ENV{CPM_DOWNLOAD_ALL}) option(CPM_DONT_UPDATE_MODULE_PATH "Don't update the module path to allow using find_package" - $ENV{CPM_DONT_UPDATE_MODULE_PATH} -) + $ENV{CPM_DONT_UPDATE_MODULE_PATH}) option(CPM_DONT_CREATE_PACKAGE_LOCK "Don't create a package lock file in the binary path" - $ENV{CPM_DONT_CREATE_PACKAGE_LOCK} -) + $ENV{CPM_DONT_CREATE_PACKAGE_LOCK}) option(CPM_INCLUDE_ALL_IN_PACKAGE_LOCK "Add all packages added through CPM.cmake to the package lock" - $ENV{CPM_INCLUDE_ALL_IN_PACKAGE_LOCK} -) + $ENV{CPM_INCLUDE_ALL_IN_PACKAGE_LOCK}) option(CPM_USE_NAMED_CACHE_DIRECTORIES "Use additional directory of package name in cache on the most nested level." - $ENV{CPM_USE_NAMED_CACHE_DIRECTORIES} -) + $ENV{CPM_USE_NAMED_CACHE_DIRECTORIES}) set(CPM_VERSION ${CURRENT_CPM_VERSION} - CACHE INTERNAL "" -) + CACHE INTERNAL "") set(CPM_DIRECTORY ${CPM_CURRENT_DIRECTORY} - CACHE INTERNAL "" -) + CACHE INTERNAL "") set(CPM_FILE ${CMAKE_CURRENT_LIST_FILE} - CACHE INTERNAL "" -) + CACHE INTERNAL "") set(CPM_PACKAGES "" - CACHE INTERNAL "" -) + CACHE INTERNAL "") set(CPM_DRY_RUN OFF - CACHE INTERNAL "Don't download or configure dependencies (for testing)" -) + CACHE INTERNAL "Don't download or configure dependencies (for testing)") if(DEFINED ENV{CPM_SOURCE_CACHE}) set(CPM_SOURCE_CACHE_DEFAULT $ENV{CPM_SOURCE_CACHE}) @@ -153,14 +138,12 @@ endif() set(CPM_SOURCE_CACHE ${CPM_SOURCE_CACHE_DEFAULT} - CACHE PATH "Directory to download CPM dependencies" -) + CACHE PATH "Directory to download CPM dependencies") if(NOT CPM_DONT_UPDATE_MODULE_PATH) set(CPM_MODULE_PATH "${CMAKE_BINARY_DIR}/CPM_modules" - CACHE INTERNAL "" - ) + CACHE INTERNAL "") # remove old modules file(REMOVE_RECURSE ${CPM_MODULE_PATH}) file(MAKE_DIRECTORY ${CPM_MODULE_PATH}) @@ -171,11 +154,9 @@ endif() if(NOT CPM_DONT_CREATE_PACKAGE_LOCK) set(CPM_PACKAGE_LOCK_FILE "${CMAKE_BINARY_DIR}/cpm-package-lock.cmake" - CACHE INTERNAL "" - ) + CACHE INTERNAL "") file(WRITE ${CPM_PACKAGE_LOCK_FILE} - "# CPM Package Lock\n# This file should be committed to version control\n\n" - ) + "# CPM Package Lock\n# This file should be committed to version control\n\n") endif() include(FetchContent) @@ -185,8 +166,7 @@ function(cpm_package_name_from_git_uri URI RESULT) if("${URI}" MATCHES "([^/:]+)/?.git/?$") set(${RESULT} ${CMAKE_MATCH_1} - PARENT_SCOPE - ) + PARENT_SCOPE) else() unset(${RESULT} PARENT_SCOPE) endif() @@ -202,12 +182,10 @@ function(cpm_package_name_and_ver_from_url url outName outVer) # We matched - (ie foo-1.2.3) set(${outName} "${CMAKE_MATCH_1}" - PARENT_SCOPE - ) + PARENT_SCOPE) set(${outVer} "${CMAKE_MATCH_2}" - PARENT_SCOPE - ) + PARENT_SCOPE) elseif(filename MATCHES "(([0-9]+\\.)+[0-9]+[a-zA-Z0-9]*)") # We couldn't find a name, but we found a version # @@ -218,8 +196,7 @@ function(cpm_package_name_and_ver_from_url url outName outVer) unset(${outName} PARENT_SCOPE) set(${outVer} "${CMAKE_MATCH_1}" - PARENT_SCOPE - ) + PARENT_SCOPE) else() # Boldly assume that the file name is the package name. # @@ -227,8 +204,7 @@ function(cpm_package_name_and_ver_from_url url outName outVer) # such cases should be quite rare. No popular service does this... we think. set(${outName} "${filename}" - PARENT_SCOPE - ) + PARENT_SCOPE) unset(${outVer} PARENT_SCOPE) endif() else() @@ -246,16 +222,14 @@ function(cpm_find_package NAME VERSION) set(VERSION ${${CPM_ARGS_NAME}_VERSION}) endif() cpm_message(STATUS "${CPM_INDENT} Using local package ${CPM_ARGS_NAME}@${VERSION}") - CPMRegisterPackage(${CPM_ARGS_NAME} "${VERSION}") + cpmregisterpackage(${CPM_ARGS_NAME} "${VERSION}") set(CPM_PACKAGE_FOUND YES - PARENT_SCOPE - ) + PARENT_SCOPE) else() set(CPM_PACKAGE_FOUND NO - PARENT_SCOPE - ) + PARENT_SCOPE) endif() endfunction() @@ -265,8 +239,7 @@ function(cpm_create_module_file Name) if(NOT CPM_DONT_UPDATE_MODULE_PATH) # erase any previous modules file(WRITE ${CPM_MODULE_PATH}/Find${Name}.cmake - "include(\"${CPM_FILE}\")\n${ARGN}\nset(${Name}_FOUND TRUE)" - ) + "include(\"${CPM_FILE}\")\n${ARGN}\nset(${Name}_FOUND TRUE)") endif() endfunction() @@ -289,7 +262,7 @@ function(CPMFindPackage) set(downloadPackage $ENV{CPM_DOWNLOAD_${CPM_ARGS_NAME}}) endif() if(downloadPackage) - CPMAddPackage(${ARGN}) + cpmaddpackage(${ARGN}) cpm_export_variables(${CPM_ARGS_NAME}) return() endif() @@ -303,7 +276,7 @@ function(CPMFindPackage) cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS}) if(NOT CPM_PACKAGE_FOUND) - CPMAddPackage(${ARGN}) + cpmaddpackage(${ARGN}) cpm_export_variables(${CPM_ARGS_NAME}) endif() @@ -312,7 +285,7 @@ endfunction() # checks if a package has been added before function(cpm_check_if_package_already_added CPM_ARGS_NAME CPM_ARGS_VERSION) if("${CPM_ARGS_NAME}" IN_LIST CPM_PACKAGES) - CPMGetPackageVersion(${CPM_ARGS_NAME} CPM_PACKAGE_VERSION) + cpmgetpackageversion(${CPM_ARGS_NAME} CPM_PACKAGE_VERSION) if("${CPM_PACKAGE_VERSION}" VERSION_LESS "${CPM_ARGS_VERSION}") message( WARNING @@ -323,14 +296,12 @@ function(cpm_check_if_package_already_added CPM_ARGS_NAME CPM_ARGS_VERSION) set(${CPM_ARGS_NAME}_ADDED NO) set(CPM_PACKAGE_ALREADY_ADDED YES - PARENT_SCOPE - ) + PARENT_SCOPE) cpm_export_variables(${CPM_ARGS_NAME}) else() set(CPM_PACKAGE_ALREADY_ADDED NO - PARENT_SCOPE - ) + PARENT_SCOPE) endif() endfunction() @@ -398,8 +369,7 @@ function(cpm_parse_add_package_single_arg arg outArgs) set(${outArgs} ${out} - PARENT_SCOPE - ) + PARENT_SCOPE) endfunction() # Check that the working directory for a git repo is clean @@ -411,8 +381,7 @@ function(cpm_check_git_working_dir_is_clean repoPath gitTag isClean) # No git executable, assume directory is clean set(${isClean} TRUE - PARENT_SCOPE - ) + PARENT_SCOPE) return() endif() @@ -422,23 +391,20 @@ function(cpm_check_git_working_dir_is_clean repoPath gitTag isClean) RESULT_VARIABLE resultGitStatus OUTPUT_VARIABLE repoStatus OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET - WORKING_DIRECTORY ${repoPath} - ) + WORKING_DIRECTORY ${repoPath}) if(resultGitStatus) # not supposed to happen, assume clean anyway message(WARNING "${CPM_INDENT} Calling git status on folder ${repoPath} failed") set(${isClean} TRUE - PARENT_SCOPE - ) + PARENT_SCOPE) return() endif() if(NOT "${repoStatus}" STREQUAL "") set(${isClean} FALSE - PARENT_SCOPE - ) + PARENT_SCOPE) return() endif() @@ -447,19 +413,16 @@ function(cpm_check_git_working_dir_is_clean repoPath gitTag isClean) COMMAND ${GIT_EXECUTABLE} diff -s --exit-code ${gitTag} RESULT_VARIABLE resultGitDiff OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_QUIET - WORKING_DIRECTORY ${repoPath} - ) + WORKING_DIRECTORY ${repoPath}) if(${resultGitDiff} EQUAL 0) set(${isClean} TRUE - PARENT_SCOPE - ) + PARENT_SCOPE) else() set(${isClean} FALSE - PARENT_SCOPE - ) + PARENT_SCOPE) endif() endfunction() @@ -482,8 +445,7 @@ function(cpm_override_fetchcontent contentName) GLOBAL PROPERTY ${propertyName} BRIEF_DOCS "Internal implementation detail of FetchContent_Populate()" - FULL_DOCS "Details used by FetchContent_Populate() for ${contentName}" - ) + FULL_DOCS "Details used by FetchContent_Populate() for ${contentName}") set_property(GLOBAL PROPERTY ${propertyName} "${arg_SOURCE_DIR}") set(propertyName "${prefix}_binaryDir") @@ -491,8 +453,7 @@ function(cpm_override_fetchcontent contentName) GLOBAL PROPERTY ${propertyName} BRIEF_DOCS "Internal implementation detail of FetchContent_Populate()" - FULL_DOCS "Details used by FetchContent_Populate() for ${contentName}" - ) + FULL_DOCS "Details used by FetchContent_Populate() for ${contentName}") set_property(GLOBAL PROPERTY ${propertyName} "${arg_BINARY_DIR}") set(propertyName "${prefix}_populated") @@ -500,8 +461,7 @@ function(cpm_override_fetchcontent contentName) GLOBAL PROPERTY ${propertyName} BRIEF_DOCS "Internal implementation detail of FetchContent_Populate()" - FULL_DOCS "Details used by FetchContent_Populate() for ${contentName}" - ) + FULL_DOCS "Details used by FetchContent_Populate() for ${contentName}") set_property(GLOBAL PROPERTY ${propertyName} TRUE) endfunction() @@ -533,8 +493,7 @@ function(CPMAddPackage) SYSTEM GIT_SHALLOW EXCLUDE_FROM_ALL - SOURCE_SUBDIR - ) + SOURCE_SUBDIR) set(multiValueArgs URL OPTIONS DOWNLOAD_COMMAND) @@ -622,16 +581,23 @@ function(CPMAddPackage) if(NOT CPM_ARGS_FORCE AND NOT "${CPM_${CPM_ARGS_NAME}_SOURCE}" STREQUAL "") set(PACKAGE_SOURCE ${CPM_${CPM_ARGS_NAME}_SOURCE}) set(CPM_${CPM_ARGS_NAME}_SOURCE "") - CPMAddPackage( - NAME "${CPM_ARGS_NAME}" - SOURCE_DIR "${PACKAGE_SOURCE}" - EXCLUDE_FROM_ALL "${CPM_ARGS_EXCLUDE_FROM_ALL}" - SYSTEM "${CPM_ARGS_SYSTEM}" - OPTIONS "${CPM_ARGS_OPTIONS}" - SOURCE_SUBDIR "${CPM_ARGS_SOURCE_SUBDIR}" - DOWNLOAD_ONLY "${DOWNLOAD_ONLY}" - FORCE True - ) + cpmaddpackage( + NAME + "${CPM_ARGS_NAME}" + SOURCE_DIR + "${PACKAGE_SOURCE}" + EXCLUDE_FROM_ALL + "${CPM_ARGS_EXCLUDE_FROM_ALL}" + SYSTEM + "${CPM_ARGS_SYSTEM}" + OPTIONS + "${CPM_ARGS_OPTIONS}" + SOURCE_SUBDIR + "${CPM_ARGS_SOURCE_SUBDIR}" + DOWNLOAD_ONLY + "${DOWNLOAD_ONLY}" + FORCE + True) cpm_export_variables(${CPM_ARGS_NAME}) return() endif() @@ -640,7 +606,7 @@ function(CPMAddPackage) if(NOT CPM_ARGS_FORCE AND NOT "${CPM_DECLARATION_${CPM_ARGS_NAME}}" STREQUAL "") set(declaration ${CPM_DECLARATION_${CPM_ARGS_NAME}}) set(CPM_DECLARATION_${CPM_ARGS_NAME} "") - CPMAddPackage(${declaration}) + cpmaddpackage(${declaration}) cpm_export_variables(${CPM_ARGS_NAME}) # checking again to ensure version and option compatibility cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}") @@ -665,7 +631,7 @@ function(CPMAddPackage) endif() endif() - CPMRegisterPackage("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}") + cpmregisterpackage("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}") if(DEFINED CPM_ARGS_GIT_TAG) set(PACKAGE_INFO "${CPM_ARGS_GIT_TAG}") @@ -689,9 +655,8 @@ function(CPMAddPackage) if(NOT IS_ABSOLUTE ${CPM_ARGS_SOURCE_DIR}) # Expand `CPM_ARGS_SOURCE_DIR` relative path. This is important because EXISTS doesn't work # for relative paths. - get_filename_component( - source_directory ${CPM_ARGS_SOURCE_DIR} REALPATH BASE_DIR ${CMAKE_CURRENT_BINARY_DIR} - ) + get_filename_component(source_directory ${CPM_ARGS_SOURCE_DIR} REALPATH BASE_DIR + ${CMAKE_CURRENT_BINARY_DIR}) else() set(source_directory ${CPM_ARGS_SOURCE_DIR}) endif() @@ -725,10 +690,8 @@ function(CPMAddPackage) file(LOCK ${download_directory}/../cmake.lock RELEASE) endif() - cpm_store_fetch_properties( - ${CPM_ARGS_NAME} "${download_directory}" - "${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-build" - ) + cpm_store_fetch_properties(${CPM_ARGS_NAME} "${download_directory}" + "${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-build") cpm_get_fetch_properties("${CPM_ARGS_NAME}") if(DEFINED CPM_ARGS_GIT_TAG AND NOT (PATCH_COMMAND IN_LIST CPM_ARGS_UNPARSED_ARGUMENTS)) @@ -736,8 +699,7 @@ function(CPMAddPackage) cpm_check_git_working_dir_is_clean(${download_directory} ${CPM_ARGS_GIT_TAG} IS_CLEAN) if(NOT ${IS_CLEAN}) message( - WARNING "${CPM_INDENT} Cache for ${CPM_ARGS_NAME} (${download_directory}) is dirty" - ) + WARNING "${CPM_INDENT} Cache for ${CPM_ARGS_NAME} (${download_directory}) is dirty") endif() endif() @@ -748,16 +710,14 @@ function(CPMAddPackage) "${${CPM_ARGS_NAME}_BINARY_DIR}" "${CPM_ARGS_EXCLUDE_FROM_ALL}" "${CPM_ARGS_SYSTEM}" - "${CPM_ARGS_OPTIONS}" - ) + "${CPM_ARGS_OPTIONS}") set(PACKAGE_INFO "${PACKAGE_INFO} at ${download_directory}") # As the source dir is already cached/populated, we override the call to FetchContent. set(CPM_SKIP_FETCH TRUE) cpm_override_fetchcontent( "${lower_case_name}" SOURCE_DIR "${${CPM_ARGS_NAME}_SOURCE_DIR}/${CPM_ARGS_SOURCE_SUBDIR}" - BINARY_DIR "${${CPM_ARGS_NAME}_BINARY_DIR}" - ) + BINARY_DIR "${${CPM_ARGS_NAME}_BINARY_DIR}") else() # Enable shallow clone when GIT_TAG is not a commit hash. Our guess may not be accurate, but @@ -787,14 +747,12 @@ function(CPMAddPackage) endif() endif() - cpm_message( - STATUS "${CPM_INDENT} Adding package ${CPM_ARGS_NAME}@${CPM_ARGS_VERSION} (${PACKAGE_INFO})" - ) + cpm_message(STATUS + "${CPM_INDENT} Adding package ${CPM_ARGS_NAME}@${CPM_ARGS_VERSION} (${PACKAGE_INFO})") if(NOT CPM_SKIP_FETCH) - cpm_declare_fetch( - "${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}" "${PACKAGE_INFO}" "${CPM_ARGS_UNPARSED_ARGUMENTS}" - ) + cpm_declare_fetch("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}" "${PACKAGE_INFO}" + "${CPM_ARGS_UNPARSED_ARGUMENTS}") cpm_fetch_package("${CPM_ARGS_NAME}" populated) if(CPM_SOURCE_CACHE AND download_directory) file(LOCK ${download_directory}/../cmake.lock RELEASE) @@ -807,8 +765,7 @@ function(CPMAddPackage) "${${CPM_ARGS_NAME}_BINARY_DIR}" "${CPM_ARGS_EXCLUDE_FROM_ALL}" "${CPM_ARGS_SYSTEM}" - "${CPM_ARGS_OPTIONS}" - ) + "${CPM_ARGS_OPTIONS}") endif() cpm_get_fetch_properties("${CPM_ARGS_NAME}") endif() @@ -820,7 +777,7 @@ endfunction() # Fetch a previously declared package macro(CPMGetPackage Name) if(DEFINED "CPM_DECLARATION_${Name}") - CPMAddPackage(NAME ${Name}) + cpmaddpackage(NAME ${Name}) else() message(SEND_ERROR "${CPM_INDENT} Cannot retrieve package ${Name}: no declaration available") endif() @@ -830,20 +787,16 @@ endmacro() macro(cpm_export_variables name) set(${name}_SOURCE_DIR "${${name}_SOURCE_DIR}" - PARENT_SCOPE - ) + PARENT_SCOPE) set(${name}_BINARY_DIR "${${name}_BINARY_DIR}" - PARENT_SCOPE - ) + PARENT_SCOPE) set(${name}_ADDED "${${name}_ADDED}" - PARENT_SCOPE - ) + PARENT_SCOPE) set(CPM_LAST_PACKAGE_NAME "${name}" - PARENT_SCOPE - ) + PARENT_SCOPE) endmacro() # declares a package, so that any call to CPMAddPackage for the package name will use these @@ -865,8 +818,7 @@ function(cpm_add_comment_to_package_lock Name) if(NOT CPM_DONT_CREATE_PACKAGE_LOCK) cpm_prettify_package_arguments(PRETTY_ARGN true ${ARGN}) file(APPEND ${CPM_PACKAGE_LOCK_FILE} - "# ${Name} (unversioned)\n# CPMDeclarePackage(${Name}\n${PRETTY_ARGN}#)\n" - ) + "# ${Name} (unversioned)\n# CPMDeclarePackage(${Name}\n${PRETTY_ARGN}#)\n") endif() endfunction() @@ -881,8 +833,7 @@ macro(CPMUsePackageLock file) if(NOT TARGET cpm-update-package-lock) add_custom_target( cpm-update-package-lock COMMAND ${CMAKE_COMMAND} -E copy ${CPM_PACKAGE_LOCK_FILE} - ${CPM_ABSOLUTE_PACKAGE_LOCK_PATH} - ) + ${CPM_ABSOLUTE_PACKAGE_LOCK_PATH}) endif() set(CPM_PACKAGE_LOCK_ENABLED true) endif() @@ -893,20 +844,17 @@ function(CPMRegisterPackage PACKAGE VERSION) list(APPEND CPM_PACKAGES ${PACKAGE}) set(CPM_PACKAGES ${CPM_PACKAGES} - CACHE INTERNAL "" - ) + CACHE INTERNAL "") set("CPM_PACKAGE_${PACKAGE}_VERSION" ${VERSION} - CACHE INTERNAL "" - ) + CACHE INTERNAL "") endfunction() # retrieve the current version of the package to ${OUTPUT} function(CPMGetPackageVersion PACKAGE OUTPUT) set(${OUTPUT} "${CPM_PACKAGE_${PACKAGE}_VERSION}" - PARENT_SCOPE - ) + PARENT_SCOPE) endfunction() # declares a package in FetchContent_Declare @@ -927,12 +875,10 @@ function(cpm_get_fetch_properties PACKAGE) set(${PACKAGE}_SOURCE_DIR "${CPM_PACKAGE_${PACKAGE}_SOURCE_DIR}" - PARENT_SCOPE - ) + PARENT_SCOPE) set(${PACKAGE}_BINARY_DIR "${CPM_PACKAGE_${PACKAGE}_BINARY_DIR}" - PARENT_SCOPE - ) + PARENT_SCOPE) endfunction() function(cpm_store_fetch_properties PACKAGE source_dir binary_dir) @@ -942,12 +888,10 @@ function(cpm_store_fetch_properties PACKAGE source_dir binary_dir) set(CPM_PACKAGE_${PACKAGE}_SOURCE_DIR "${source_dir}" - CACHE INTERNAL "" - ) + CACHE INTERNAL "") set(CPM_PACKAGE_${PACKAGE}_BINARY_DIR "${binary_dir}" - CACHE INTERNAL "" - ) + CACHE INTERNAL "") endfunction() # adds a package as a subdirectory if viable, according to provided options @@ -959,8 +903,7 @@ function( BINARY_DIR EXCLUDE SYSTEM - OPTIONS -) + OPTIONS) if(NOT DOWNLOAD_ONLY AND EXISTS ${SOURCE_DIR}/CMakeLists.txt) set(addSubdirectoryExtraArgs "") @@ -989,8 +932,7 @@ endfunction() function(cpm_fetch_package PACKAGE populated) set(${populated} FALSE - PARENT_SCOPE - ) + PARENT_SCOPE) if(${CPM_DRY_RUN}) cpm_message(STATUS "${CPM_INDENT} Package ${PACKAGE} not fetched (dry run)") return() @@ -1004,22 +946,18 @@ function(cpm_fetch_package PACKAGE populated) FetchContent_Populate(${PACKAGE}) set(${populated} TRUE - PARENT_SCOPE - ) + PARENT_SCOPE) endif() - cpm_store_fetch_properties( - ${CPM_ARGS_NAME} ${${lower_case_name}_SOURCE_DIR} ${${lower_case_name}_BINARY_DIR} - ) + cpm_store_fetch_properties(${CPM_ARGS_NAME} ${${lower_case_name}_SOURCE_DIR} + ${${lower_case_name}_BINARY_DIR}) set(${PACKAGE}_SOURCE_DIR ${${lower_case_name}_SOURCE_DIR} - PARENT_SCOPE - ) + PARENT_SCOPE) set(${PACKAGE}_BINARY_DIR ${${lower_case_name}_BINARY_DIR} - PARENT_SCOPE - ) + PARENT_SCOPE) endfunction() # splits a package option @@ -1036,12 +974,10 @@ function(cpm_parse_option OPTION) endif() set(OPTION_KEY "${OPTION_KEY}" - PARENT_SCOPE - ) + PARENT_SCOPE) set(OPTION_VALUE "${OPTION_VALUE}" - PARENT_SCOPE - ) + PARENT_SCOPE) endfunction() # guesses the package version from a git tag @@ -1051,14 +987,12 @@ function(cpm_get_version_from_git_tag GIT_TAG RESULT) # GIT_TAG is probably a git hash set(${RESULT} 0 - PARENT_SCOPE - ) + PARENT_SCOPE) else() string(REGEX MATCH "v?([0123456789.]*).*" _ ${GIT_TAG}) set(${RESULT} ${CMAKE_MATCH_1} - PARENT_SCOPE - ) + PARENT_SCOPE) endif() endfunction() @@ -1069,19 +1003,16 @@ function(cpm_is_git_tag_commit_hash GIT_TAG RESULT) if(length LESS 7 OR length GREATER 40) set(${RESULT} 0 - PARENT_SCOPE - ) + PARENT_SCOPE) else() if(${GIT_TAG} MATCHES "^[a-fA-F0-9]+$") set(${RESULT} 1 - PARENT_SCOPE - ) + PARENT_SCOPE) else() set(${RESULT} 0 - PARENT_SCOPE - ) + PARENT_SCOPE) endif() endif() endfunction() @@ -1103,8 +1034,7 @@ function(cpm_prettify_package_arguments OUT_VAR IS_IN_COMMENT) SYSTEM GIT_SHALLOW EXCLUDE_FROM_ALL - SOURCE_SUBDIR - ) + SOURCE_SUBDIR) set(multiValueArgs URL OPTIONS DOWNLOAD_COMMAND) cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) @@ -1115,8 +1045,7 @@ function(cpm_prettify_package_arguments OUT_VAR IS_IN_COMMENT) endif() if(${oneArgName} STREQUAL "SOURCE_DIR") string(REPLACE ${CMAKE_SOURCE_DIR} "\${CMAKE_SOURCE_DIR}" CPM_ARGS_${oneArgName} - ${CPM_ARGS_${oneArgName}} - ) + ${CPM_ARGS_${oneArgName}}) endif() string(APPEND PRETTY_OUT_VAR " ${oneArgName} ${CPM_ARGS_${oneArgName}}\n") endif() @@ -1149,7 +1078,6 @@ function(cpm_prettify_package_arguments OUT_VAR IS_IN_COMMENT) set(${OUT_VAR} ${PRETTY_OUT_VAR} - PARENT_SCOPE - ) + PARENT_SCOPE) endfunction() From 08fc6facfb275870c1edab2a1d54cfd731c17a20 Mon Sep 17 00:00:00 2001 From: Curve Date: Wed, 29 Nov 2023 09:10:10 +0100 Subject: [PATCH 23/41] fix(cmake-format): define CPM functions --- .cmake-format | 3 ++ CMakeLists.txt | 60 ++++++++++++++++++------------------- Python/CMakeLists.txt | 5 +++- cmake/.cpm-format | 69 +++++++++++++++++++++++++++++++++++++++++++ cmake/cpm.cmake | 40 ++++++++++--------------- format-project.sh | 2 +- 6 files changed, 122 insertions(+), 57 deletions(-) create mode 100644 .cmake-format create mode 100644 cmake/.cpm-format diff --git a/.cmake-format b/.cmake-format new file mode 100644 index 00000000..fb1689ad --- /dev/null +++ b/.cmake-format @@ -0,0 +1,3 @@ +include: ["cmake/.cpm-format"] +format: + line_width: 100 diff --git a/CMakeLists.txt b/CMakeLists.txt index e9bdd8e6..1f8ead2a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,42 +88,40 @@ target_include_directories(${PROJECT_NAME} INTERFACE "include") include("cmake/cpm.cmake") -cpmaddpackage(NAME ViennaHRLE GIT_TAG master GIT_REPOSITORY - "https://github.com/ViennaTools/ViennaHRLE") +CPMAddPackage( + NAME ViennaHRLE + GIT_TAG master + GIT_REPOSITORY "https://github.com/ViennaTools/ViennaHRLE") find_package(OpenMP REQUIRED) target_link_libraries(${PROJECT_NAME} INTERFACE OpenMP::OpenMP_CXX ViennaHRLE) if(VIENNALS_USE_VTK) - cpmaddpackage( - NAME - VTK - VERSION - 9.3.0 - GIT_REPOSITORY - "https://gitlab.kitware.com/vtk/vtk" - OPTIONS - "VTK_LEGACY_REMOVE ON" - "VTK_SMP_IMPLEMENTATION_TYPE \"OpenMP\"" - "VTK_GROUP_ENABLE_Rendering NO" - "VTK_GROUP_ENABLE_Imaging NO" - "VTK_GROUP_ENABLE_Views NO" - "TK_GROUP_ENABLE_Web NO" - "VTK_GROUP_ENABLE_Qt NO" - "VTK_GROUP_ENABLE_MPI NO" - "VTK_MODULE_ENABLE_VTK_CommonExecutionModel YES" - "VTK_MODULE_ENABLE_VTK_CommonMisc YES" - "VTK_MODULE_ENABLE_VTK_CommonSystem YES" - "VTK_MODULE_ENABLE_VTK_CommonMath YES" - "VTK_MODULE_ENABLE_VTK_CommonCore YES" - "VTK_MODULE_ENABLE_VTK_CommonTransforms YES" - "VTK_MODULE_ENABLE_VTK_CommonComputationalGeometry YES" - "VTK_MODULE_ENABLE_VTK_IOCore YES" - "VTK_MODULE_ENABLE_VTK_IOXMLParser YES" - "VTK_MODULE_ENABLE_VTK_IOXML YES" - "VTK_MODULE_ENABLE_VTK_FiltersCore YES" - "VTK_MODULE_ENABLE_VTK_FiltersGeneral YES" - "VTK_MODULE_ENABLE_VTK_FiltersGeometry YES") + CPMAddPackage( + NAME VTK + VERSION 9.3.0 + GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk" + OPTIONS "VTK_LEGACY_REMOVE ON" + "VTK_SMP_IMPLEMENTATION_TYPE \"OpenMP\"" + "VTK_GROUP_ENABLE_Rendering NO" + "VTK_GROUP_ENABLE_Imaging NO" + "VTK_GROUP_ENABLE_Views NO" + "TK_GROUP_ENABLE_Web NO" + "VTK_GROUP_ENABLE_Qt NO" + "VTK_GROUP_ENABLE_MPI NO" + "VTK_MODULE_ENABLE_VTK_CommonExecutionModel YES" + "VTK_MODULE_ENABLE_VTK_CommonMisc YES" + "VTK_MODULE_ENABLE_VTK_CommonSystem YES" + "VTK_MODULE_ENABLE_VTK_CommonMath YES" + "VTK_MODULE_ENABLE_VTK_CommonCore YES" + "VTK_MODULE_ENABLE_VTK_CommonTransforms YES" + "VTK_MODULE_ENABLE_VTK_CommonComputationalGeometry YES" + "VTK_MODULE_ENABLE_VTK_IOCore YES" + "VTK_MODULE_ENABLE_VTK_IOXMLParser YES" + "VTK_MODULE_ENABLE_VTK_IOXML YES" + "VTK_MODULE_ENABLE_VTK_FiltersCore YES" + "VTK_MODULE_ENABLE_VTK_FiltersGeneral YES" + "VTK_MODULE_ENABLE_VTK_FiltersGeometry YES") target_compile_definitions(${PROJECT_NAME} INTERFACE VIENNALS_USE_VTK=1) diff --git a/Python/CMakeLists.txt b/Python/CMakeLists.txt index f278a697..ac5a9520 100644 --- a/Python/CMakeLists.txt +++ b/Python/CMakeLists.txt @@ -12,7 +12,10 @@ set(PYBIND11_PYTHON_VERSION 3 CACHE STRING "Python version") -cpmaddpackage(NAME pybind11 VERSION 2.11.1 GIT_REPOSITORY "https://github.com/pybind/pybind11") +CPMAddPackage( + NAME pybind11 + VERSION 2.11.1 + GIT_REPOSITORY "https://github.com/pybind/pybind11") # -------------------------------------------------------------------------------------------------------- # Constants diff --git a/cmake/.cpm-format b/cmake/.cpm-format new file mode 100644 index 00000000..284c984c --- /dev/null +++ b/cmake/.cpm-format @@ -0,0 +1,69 @@ +parse: + additional_commands: + cpmaddpackage: + pargs: + nargs: '*' + flags: [] + spelling: CPMAddPackage + kwargs: &cpmaddpackagekwargs + NAME: 1 + FORCE: 1 + VERSION: 1 + GIT_TAG: 1 + DOWNLOAD_ONLY: 1 + GITHUB_REPOSITORY: 1 + GITLAB_REPOSITORY: 1 + GIT_REPOSITORY: 1 + SVN_REPOSITORY: 1 + SVN_REVISION: 1 + SOURCE_DIR: 1 + DOWNLOAD_COMMAND: 1 + FIND_PACKAGE_ARGUMENTS: 1 + NO_CACHE: 1 + GIT_SHALLOW: 1 + URL: 1 + URL_HASH: 1 + URL_MD5: 1 + DOWNLOAD_NAME: 1 + DOWNLOAD_NO_EXTRACT: 1 + HTTP_USERNAME: 1 + HTTP_PASSWORD: 1 + EXCLUDE_FROM_ALL: 1 + SYSTEM: 1 + SOURCE_SUBDIR: 1 + OPTIONS: + + cpmfindpackage: + pargs: + nargs: '*' + flags: [] + spelling: CPMFindPackage + kwargs: *cpmaddpackagekwargs + cpmdeclarepackage: + pargs: + nargs: '*' + flags: [] + spelling: CPMDeclarePackage + kwargs: *cpmaddpackagekwargs + packageproject: + pargs: + nargs: '*' + flags: [] + spelling: packageProject + kwargs: + NAME: 1 + VERSION: 1 + INCLUDE_DIR: 1 + INCLUDE_DESTINATION: 1 + BINARY_DIR: 1 + COMPATIBILITY: 1 + VERSION_HEADER: 1 + DEPENDENCIES: + + cpmusepackagelock: + pargs: 1 + spelling: CPMUsePackageLock + cpmregisterpackage: + pargs: 1 + spelling: CPMRegisterPackage + cpmgetpackageversion: + pargs: 2 + spelling: CPMGetPackageVersion diff --git a/cmake/cpm.cmake b/cmake/cpm.cmake index f6fac70d..8cbbf9a5 100644 --- a/cmake/cpm.cmake +++ b/cmake/cpm.cmake @@ -222,7 +222,7 @@ function(cpm_find_package NAME VERSION) set(VERSION ${${CPM_ARGS_NAME}_VERSION}) endif() cpm_message(STATUS "${CPM_INDENT} Using local package ${CPM_ARGS_NAME}@${VERSION}") - cpmregisterpackage(${CPM_ARGS_NAME} "${VERSION}") + CPMRegisterPackage(${CPM_ARGS_NAME} "${VERSION}") set(CPM_PACKAGE_FOUND YES PARENT_SCOPE) @@ -262,7 +262,7 @@ function(CPMFindPackage) set(downloadPackage $ENV{CPM_DOWNLOAD_${CPM_ARGS_NAME}}) endif() if(downloadPackage) - cpmaddpackage(${ARGN}) + CPMAddPackage(${ARGN}) cpm_export_variables(${CPM_ARGS_NAME}) return() endif() @@ -276,7 +276,7 @@ function(CPMFindPackage) cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS}) if(NOT CPM_PACKAGE_FOUND) - cpmaddpackage(${ARGN}) + CPMAddPackage(${ARGN}) cpm_export_variables(${CPM_ARGS_NAME}) endif() @@ -285,7 +285,7 @@ endfunction() # checks if a package has been added before function(cpm_check_if_package_already_added CPM_ARGS_NAME CPM_ARGS_VERSION) if("${CPM_ARGS_NAME}" IN_LIST CPM_PACKAGES) - cpmgetpackageversion(${CPM_ARGS_NAME} CPM_PACKAGE_VERSION) + CPMGetPackageVersion(${CPM_ARGS_NAME} CPM_PACKAGE_VERSION) if("${CPM_PACKAGE_VERSION}" VERSION_LESS "${CPM_ARGS_VERSION}") message( WARNING @@ -581,23 +581,15 @@ function(CPMAddPackage) if(NOT CPM_ARGS_FORCE AND NOT "${CPM_${CPM_ARGS_NAME}_SOURCE}" STREQUAL "") set(PACKAGE_SOURCE ${CPM_${CPM_ARGS_NAME}_SOURCE}) set(CPM_${CPM_ARGS_NAME}_SOURCE "") - cpmaddpackage( - NAME - "${CPM_ARGS_NAME}" - SOURCE_DIR - "${PACKAGE_SOURCE}" - EXCLUDE_FROM_ALL - "${CPM_ARGS_EXCLUDE_FROM_ALL}" - SYSTEM - "${CPM_ARGS_SYSTEM}" - OPTIONS - "${CPM_ARGS_OPTIONS}" - SOURCE_SUBDIR - "${CPM_ARGS_SOURCE_SUBDIR}" - DOWNLOAD_ONLY - "${DOWNLOAD_ONLY}" - FORCE - True) + CPMAddPackage( + NAME "${CPM_ARGS_NAME}" + SOURCE_DIR "${PACKAGE_SOURCE}" + EXCLUDE_FROM_ALL "${CPM_ARGS_EXCLUDE_FROM_ALL}" + SYSTEM "${CPM_ARGS_SYSTEM}" + OPTIONS "${CPM_ARGS_OPTIONS}" + SOURCE_SUBDIR "${CPM_ARGS_SOURCE_SUBDIR}" + DOWNLOAD_ONLY "${DOWNLOAD_ONLY}" + FORCE True) cpm_export_variables(${CPM_ARGS_NAME}) return() endif() @@ -606,7 +598,7 @@ function(CPMAddPackage) if(NOT CPM_ARGS_FORCE AND NOT "${CPM_DECLARATION_${CPM_ARGS_NAME}}" STREQUAL "") set(declaration ${CPM_DECLARATION_${CPM_ARGS_NAME}}) set(CPM_DECLARATION_${CPM_ARGS_NAME} "") - cpmaddpackage(${declaration}) + CPMAddPackage(${declaration}) cpm_export_variables(${CPM_ARGS_NAME}) # checking again to ensure version and option compatibility cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}") @@ -631,7 +623,7 @@ function(CPMAddPackage) endif() endif() - cpmregisterpackage("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}") + CPMRegisterPackage("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}") if(DEFINED CPM_ARGS_GIT_TAG) set(PACKAGE_INFO "${CPM_ARGS_GIT_TAG}") @@ -777,7 +769,7 @@ endfunction() # Fetch a previously declared package macro(CPMGetPackage Name) if(DEFINED "CPM_DECLARATION_${Name}") - cpmaddpackage(NAME ${Name}) + CPMAddPackage(NAME ${Name}) else() message(SEND_ERROR "${CPM_INDENT} Cannot retrieve package ${Name}: no declaration available") endif() diff --git a/format-project.sh b/format-project.sh index a4f19b3f..47da0b03 100755 --- a/format-project.sh +++ b/format-project.sh @@ -9,5 +9,5 @@ find . -type d \( -path ./dependencies -o -path "./build*" \) -prune -false -o - if command -v cmake-format &> /dev/null then - find . -type d \( -path ./dependencies -o -path "./build*" \) -prune -false -o -name "*.cmake" -o -name CMakeLists.txt -o -name "*.cmake.in" | while read -r i; do echo "$i"; cmake-format --line-width 100 -i "$i"; done + find . -type d \( -path ./dependencies -o -path "./build*" \) -prune -false -o -name "*.cmake" -o -name CMakeLists.txt -o -name "*.cmake.in" | while read -r i; do echo "$i"; cmake-format -i "$i"; done fi From 89e63fb0626c60a2fa5f5579fa1ee4a7c845417a Mon Sep 17 00:00:00 2001 From: Curve Date: Wed, 29 Nov 2023 09:21:22 +0100 Subject: [PATCH 24/41] fix(vtk): disable libproj support * Should fix Windows workflow --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f8ead2a..4a09afd0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,6 +109,7 @@ if(VIENNALS_USE_VTK) "TK_GROUP_ENABLE_Web NO" "VTK_GROUP_ENABLE_Qt NO" "VTK_GROUP_ENABLE_MPI NO" + "VTK_ENABLE_sqlite NO" "VTK_MODULE_ENABLE_VTK_CommonExecutionModel YES" "VTK_MODULE_ENABLE_VTK_CommonMisc YES" "VTK_MODULE_ENABLE_VTK_CommonSystem YES" From 6315461b9135f760c70c210ac80a28c2abf18cea Mon Sep 17 00:00:00 2001 From: Curve Date: Wed, 29 Nov 2023 12:23:00 +0100 Subject: [PATCH 25/41] revert: formatting --- include/lsFromSurfaceMesh.hpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/include/lsFromSurfaceMesh.hpp b/include/lsFromSurfaceMesh.hpp index 1e3f63b0..3f72c302 100644 --- a/include/lsFromSurfaceMesh.hpp +++ b/include/lsFromSurfaceMesh.hpp @@ -216,10 +216,11 @@ template class lsFromSurfaceMesh { lsFromSurfaceMesh(lsSmartPointer> passedLevelSet, lsSmartPointer> passedMesh, bool passedRemoveBoundaryTriangles = true) - : levelSet(passedLevelSet), mesh(passedMesh), - removeBoundaryTriangles{passedRemoveBoundaryTriangles, - passedRemoveBoundaryTriangles, - passedRemoveBoundaryTriangles} {} + : levelSet(passedLevelSet), + mesh(passedMesh), removeBoundaryTriangles{ + passedRemoveBoundaryTriangles, + passedRemoveBoundaryTriangles, + passedRemoveBoundaryTriangles} {} void setLevelSet(lsSmartPointer> passedLevelSet) { levelSet = passedLevelSet; From 1184801992ea837537046d365fb342d614c8a968 Mon Sep 17 00:00:00 2001 From: Curve Date: Wed, 29 Nov 2023 12:43:43 +0100 Subject: [PATCH 26/41] fix(ci/windows): enable long paths --- .github/workflows/windows_test.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/windows_test.yml b/.github/workflows/windows_test.yml index b0a807aa..2770d1e6 100644 --- a/.github/workflows/windows_test.yml +++ b/.github/workflows/windows_test.yml @@ -71,6 +71,11 @@ jobs: key: viennals-dependency-cache-${{ runner.os }}-${{env.BUILD_TYPE}}-${{ hashFiles( './external/upstream/**CMakeLists.txt' ) }} path: ${{github.workspace}}/dependencies/Install + - name: Configure Git + # Workaround for windows, as the filename is 260 by default, however + # VTK has some files that exceed this limit, thus we need this workaround. + run: git config --system core.longpaths true + - name: Build and install Python module shell: bash run: pip3 install --user . -v From d75cd9c0b9b7b25e3e36b249b15aa1f73a6bd6f9 Mon Sep 17 00:00:00 2001 From: Curve Date: Wed, 29 Nov 2023 12:45:23 +0100 Subject: [PATCH 27/41] refactor(cmake): disable wrapping for vtk and disable libproj --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a09afd0..fddf022a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -109,7 +109,8 @@ if(VIENNALS_USE_VTK) "TK_GROUP_ENABLE_Web NO" "VTK_GROUP_ENABLE_Qt NO" "VTK_GROUP_ENABLE_MPI NO" - "VTK_ENABLE_sqlite NO" + "VTK_ENABLE_WRAPPING NO" + "VTK_MODULE_ENABLE_VTK_libproj NO" "VTK_MODULE_ENABLE_VTK_CommonExecutionModel YES" "VTK_MODULE_ENABLE_VTK_CommonMisc YES" "VTK_MODULE_ENABLE_VTK_CommonSystem YES" From e6b56f71f28ceb7c4d657ae4bd9ef490a960c2ec Mon Sep 17 00:00:00 2001 From: Curve Date: Wed, 29 Nov 2023 12:45:43 +0100 Subject: [PATCH 28/41] refactor(cmake): disable sanitizer by default --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fddf022a..7d1d91ac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ option(VIENNALS_USE_VTK "Build with VTK file support" ON) option(VIENNALS_PRECOMPILE_HEADERS "Build template specialisations for shorter compile times" OFF) option(VIENNALS_STATIC_BUILD "Build dependencies as static libraries" OFF) -option(VIENNALS_ENABLE_SANITIZER "Enable Sanitizer for debug buidlds" ON) +option(VIENNALS_ENABLE_SANITIZER "Enable Sanitizer for debug buidlds" OFF) option(VIENNALS_USE_SANITIZER "Enable Sanitizer (Requires GCC or Clang)" OFF) option(VIENNALS_BUILD_EXAMPLES "Build examples" OFF) From 8c894ba77bd5700b443b321ee44801a081f77b26 Mon Sep 17 00:00:00 2001 From: Curve Date: Wed, 29 Nov 2023 15:09:13 +0100 Subject: [PATCH 29/41] fix(windows): only export symbols for viennals --- CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d1d91ac..3c8c2fac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,10 +49,6 @@ if((VIENNALS_ENABLE_SANITIZER AND CMAKE_BUILD_TYPE STREQUAL "Debug") OR VIENNALS message(STATUS "[ViennaLS] Using Sanitizer") endif() -if(MSVC) - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON) -endif() - set(CPM_USE_LOCAL_PACKAGES ON) # -------------------------------------------------------------------------------------------------------- @@ -164,6 +160,7 @@ if(VIENNALS_PRECOMPILE_HEADERS) target_link_libraries(${PROJECT_NAME}Lib PUBLIC ${PROJECT_NAME}) target_sources(${PROJECT_NAME}Lib PUBLIC "lib/specialisations.cpp") + set_target_properties(${PROJECT_NAME}Lib PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) endif() # -------------------------------------------------------------------------------------------------------- From a3898eb543314fcd4236fea6091bed7335075d04 Mon Sep 17 00:00:00 2001 From: Curve Date: Wed, 29 Nov 2023 15:50:37 +0100 Subject: [PATCH 30/41] refactor(cmake): exclude dependencies from all target --- CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 3c8c2fac..d22ad626 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,7 +87,8 @@ include("cmake/cpm.cmake") CPMAddPackage( NAME ViennaHRLE GIT_TAG master - GIT_REPOSITORY "https://github.com/ViennaTools/ViennaHRLE") + GIT_REPOSITORY "https://github.com/ViennaTools/ViennaHRLE" + EXCLUDE_FROM_ALL ON) find_package(OpenMP REQUIRED) target_link_libraries(${PROJECT_NAME} INTERFACE OpenMP::OpenMP_CXX ViennaHRLE) @@ -119,7 +120,8 @@ if(VIENNALS_USE_VTK) "VTK_MODULE_ENABLE_VTK_IOXML YES" "VTK_MODULE_ENABLE_VTK_FiltersCore YES" "VTK_MODULE_ENABLE_VTK_FiltersGeneral YES" - "VTK_MODULE_ENABLE_VTK_FiltersGeometry YES") + "VTK_MODULE_ENABLE_VTK_FiltersGeometry YES" + EXCLUDE_FROM_ALL ON) target_compile_definitions(${PROJECT_NAME} INTERFACE VIENNALS_USE_VTK=1) From 6b5bef86d55b5422dfa248be0cbae3768f7d7af0 Mon Sep 17 00:00:00 2001 From: Curve Date: Wed, 29 Nov 2023 15:50:54 +0100 Subject: [PATCH 31/41] refactor(cmake): use get-cpm --- cmake/cpm.cmake | 1082 +---------------------------------------------- 1 file changed, 15 insertions(+), 1067 deletions(-) diff --git a/cmake/cpm.cmake b/cmake/cpm.cmake index 8cbbf9a5..3ca29064 100644 --- a/cmake/cpm.cmake +++ b/cmake/cpm.cmake @@ -1,1075 +1,23 @@ -# CPM.cmake - CMake's missing package manager -# =========================================== -# See https://github.com/cpm-cmake/CPM.cmake for usage and update instructions. +# SPDX-License-Identifier: MIT # -# MIT License -# ----------- -#[[ - Copyright (c) 2019-2023 Lars Melchior and contributors +# SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors - Permission is hereby granted, free of charge, to any person obtaining a copy - of this software and associated documentation files (the "Software"), to deal - in the Software without restriction, including without limitation the rights - to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the Software is - furnished to do so, subject to the following conditions: +set(CPM_DOWNLOAD_VERSION 0.38.6) +set(CPM_HASH_SUM "11c3fa5f1ba14f15d31c2fb63dbc8628ee133d81c8d764caad9a8db9e0bacb07") - The above copyright notice and this permission notice shall be included in all - copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - SOFTWARE. -]] - -cmake_minimum_required(VERSION 3.14 FATAL_ERROR) - -# Initialize logging prefix -if(NOT CPM_INDENT) - set(CPM_INDENT - "CPM:" - CACHE INTERNAL "") -endif() - -if(NOT COMMAND cpm_message) - function(cpm_message) - message(${ARGV}) - endfunction() -endif() - -set(CURRENT_CPM_VERSION 0.38.6) - -get_filename_component(CPM_CURRENT_DIRECTORY "${CMAKE_CURRENT_LIST_DIR}" REALPATH) -if(CPM_DIRECTORY) - if(NOT CPM_DIRECTORY STREQUAL CPM_CURRENT_DIRECTORY) - if(CPM_VERSION VERSION_LESS CURRENT_CPM_VERSION) - message( - AUTHOR_WARNING - "${CPM_INDENT} \ -A dependency is using a more recent CPM version (${CURRENT_CPM_VERSION}) than the current project (${CPM_VERSION}). \ -It is recommended to upgrade CPM to the most recent version. \ -See https://github.com/cpm-cmake/CPM.cmake for more information.") - endif() - if(${CMAKE_VERSION} VERSION_LESS "3.17.0") - include(FetchContent) - endif() - return() - endif() - - get_property( - CPM_INITIALIZED GLOBAL "" - PROPERTY CPM_INITIALIZED - SET) - if(CPM_INITIALIZED) - return() - endif() -endif() - -if(CURRENT_CPM_VERSION MATCHES "development-version") - message( - WARNING "${CPM_INDENT} Your project is using an unstable development version of CPM.cmake. \ -Please update to a recent release if possible. \ -See https://github.com/cpm-cmake/CPM.cmake for details.") -endif() - -set_property(GLOBAL PROPERTY CPM_INITIALIZED true) - -macro(cpm_set_policies) - # the policy allows us to change options without caching - cmake_policy(SET CMP0077 NEW) - set(CMAKE_POLICY_DEFAULT_CMP0077 NEW) - - # the policy allows us to change set(CACHE) without caching - if(POLICY CMP0126) - cmake_policy(SET CMP0126 NEW) - set(CMAKE_POLICY_DEFAULT_CMP0126 NEW) - endif() - - # The policy uses the download time for timestamp, instead of the timestamp in the archive. This - # allows for proper rebuilds when a projects url changes - if(POLICY CMP0135) - cmake_policy(SET CMP0135 NEW) - set(CMAKE_POLICY_DEFAULT_CMP0135 NEW) - endif() -endmacro() -cpm_set_policies() - -option(CPM_USE_LOCAL_PACKAGES "Always try to use `find_package` to get dependencies" - $ENV{CPM_USE_LOCAL_PACKAGES}) -option(CPM_LOCAL_PACKAGES_ONLY "Only use `find_package` to get dependencies" - $ENV{CPM_LOCAL_PACKAGES_ONLY}) -option(CPM_DOWNLOAD_ALL "Always download dependencies from source" $ENV{CPM_DOWNLOAD_ALL}) -option(CPM_DONT_UPDATE_MODULE_PATH "Don't update the module path to allow using find_package" - $ENV{CPM_DONT_UPDATE_MODULE_PATH}) -option(CPM_DONT_CREATE_PACKAGE_LOCK "Don't create a package lock file in the binary path" - $ENV{CPM_DONT_CREATE_PACKAGE_LOCK}) -option(CPM_INCLUDE_ALL_IN_PACKAGE_LOCK - "Add all packages added through CPM.cmake to the package lock" - $ENV{CPM_INCLUDE_ALL_IN_PACKAGE_LOCK}) -option(CPM_USE_NAMED_CACHE_DIRECTORIES - "Use additional directory of package name in cache on the most nested level." - $ENV{CPM_USE_NAMED_CACHE_DIRECTORIES}) - -set(CPM_VERSION - ${CURRENT_CPM_VERSION} - CACHE INTERNAL "") -set(CPM_DIRECTORY - ${CPM_CURRENT_DIRECTORY} - CACHE INTERNAL "") -set(CPM_FILE - ${CMAKE_CURRENT_LIST_FILE} - CACHE INTERNAL "") -set(CPM_PACKAGES - "" - CACHE INTERNAL "") -set(CPM_DRY_RUN - OFF - CACHE INTERNAL "Don't download or configure dependencies (for testing)") - -if(DEFINED ENV{CPM_SOURCE_CACHE}) - set(CPM_SOURCE_CACHE_DEFAULT $ENV{CPM_SOURCE_CACHE}) +if(CPM_SOURCE_CACHE) + set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake") +elseif(DEFINED ENV{CPM_SOURCE_CACHE}) + set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake") else() - set(CPM_SOURCE_CACHE_DEFAULT OFF) -endif() - -set(CPM_SOURCE_CACHE - ${CPM_SOURCE_CACHE_DEFAULT} - CACHE PATH "Directory to download CPM dependencies") - -if(NOT CPM_DONT_UPDATE_MODULE_PATH) - set(CPM_MODULE_PATH - "${CMAKE_BINARY_DIR}/CPM_modules" - CACHE INTERNAL "") - # remove old modules - file(REMOVE_RECURSE ${CPM_MODULE_PATH}) - file(MAKE_DIRECTORY ${CPM_MODULE_PATH}) - # locally added CPM modules should override global packages - set(CMAKE_MODULE_PATH "${CPM_MODULE_PATH};${CMAKE_MODULE_PATH}") -endif() - -if(NOT CPM_DONT_CREATE_PACKAGE_LOCK) - set(CPM_PACKAGE_LOCK_FILE - "${CMAKE_BINARY_DIR}/cpm-package-lock.cmake" - CACHE INTERNAL "") - file(WRITE ${CPM_PACKAGE_LOCK_FILE} - "# CPM Package Lock\n# This file should be committed to version control\n\n") + set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake") endif() -include(FetchContent) - -# Try to infer package name from git repository uri (path or url) -function(cpm_package_name_from_git_uri URI RESULT) - if("${URI}" MATCHES "([^/:]+)/?.git/?$") - set(${RESULT} - ${CMAKE_MATCH_1} - PARENT_SCOPE) - else() - unset(${RESULT} PARENT_SCOPE) - endif() -endfunction() - -# Try to infer package name and version from a url -function(cpm_package_name_and_ver_from_url url outName outVer) - if(url MATCHES "[/\\?]([a-zA-Z0-9_\\.-]+)\\.(tar|tar\\.gz|tar\\.bz2|zip|ZIP)(\\?|/|$)") - # We matched an archive - set(filename "${CMAKE_MATCH_1}") - - if(filename MATCHES "([a-zA-Z0-9_\\.-]+)[_-]v?(([0-9]+\\.)*[0-9]+[a-zA-Z0-9]*)") - # We matched - (ie foo-1.2.3) - set(${outName} - "${CMAKE_MATCH_1}" - PARENT_SCOPE) - set(${outVer} - "${CMAKE_MATCH_2}" - PARENT_SCOPE) - elseif(filename MATCHES "(([0-9]+\\.)+[0-9]+[a-zA-Z0-9]*)") - # We couldn't find a name, but we found a version - # - # In many cases (which we don't handle here) the url would look something like - # `irrelevant/ACTUAL_PACKAGE_NAME/irrelevant/1.2.3.zip`. In such a case we can't possibly - # distinguish the package name from the irrelevant bits. Moreover if we try to match the - # package name from the filename, we'd get bogus at best. - unset(${outName} PARENT_SCOPE) - set(${outVer} - "${CMAKE_MATCH_1}" - PARENT_SCOPE) - else() - # Boldly assume that the file name is the package name. - # - # Yes, something like `irrelevant/ACTUAL_NAME/irrelevant/download.zip` will ruin our day, but - # such cases should be quite rare. No popular service does this... we think. - set(${outName} - "${filename}" - PARENT_SCOPE) - unset(${outVer} PARENT_SCOPE) - endif() - else() - # No ideas yet what to do with non-archives - unset(${outName} PARENT_SCOPE) - unset(${outVer} PARENT_SCOPE) - endif() -endfunction() - -function(cpm_find_package NAME VERSION) - string(REPLACE " " ";" EXTRA_ARGS "${ARGN}") - find_package(${NAME} ${VERSION} ${EXTRA_ARGS} QUIET) - if(${CPM_ARGS_NAME}_FOUND) - if(DEFINED ${CPM_ARGS_NAME}_VERSION) - set(VERSION ${${CPM_ARGS_NAME}_VERSION}) - endif() - cpm_message(STATUS "${CPM_INDENT} Using local package ${CPM_ARGS_NAME}@${VERSION}") - CPMRegisterPackage(${CPM_ARGS_NAME} "${VERSION}") - set(CPM_PACKAGE_FOUND - YES - PARENT_SCOPE) - else() - set(CPM_PACKAGE_FOUND - NO - PARENT_SCOPE) - endif() -endfunction() - -# Create a custom FindXXX.cmake module for a CPM package This prevents `find_package(NAME)` from -# finding the system library -function(cpm_create_module_file Name) - if(NOT CPM_DONT_UPDATE_MODULE_PATH) - # erase any previous modules - file(WRITE ${CPM_MODULE_PATH}/Find${Name}.cmake - "include(\"${CPM_FILE}\")\n${ARGN}\nset(${Name}_FOUND TRUE)") - endif() -endfunction() - -# Find a package locally or fallback to CPMAddPackage -function(CPMFindPackage) - set(oneValueArgs NAME VERSION GIT_TAG FIND_PACKAGE_ARGUMENTS) - - cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "" ${ARGN}) - - if(NOT DEFINED CPM_ARGS_VERSION) - if(DEFINED CPM_ARGS_GIT_TAG) - cpm_get_version_from_git_tag("${CPM_ARGS_GIT_TAG}" CPM_ARGS_VERSION) - endif() - endif() - - set(downloadPackage ${CPM_DOWNLOAD_ALL}) - if(DEFINED CPM_DOWNLOAD_${CPM_ARGS_NAME}) - set(downloadPackage ${CPM_DOWNLOAD_${CPM_ARGS_NAME}}) - elseif(DEFINED ENV{CPM_DOWNLOAD_${CPM_ARGS_NAME}}) - set(downloadPackage $ENV{CPM_DOWNLOAD_${CPM_ARGS_NAME}}) - endif() - if(downloadPackage) - CPMAddPackage(${ARGN}) - cpm_export_variables(${CPM_ARGS_NAME}) - return() - endif() - - cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}") - if(CPM_PACKAGE_ALREADY_ADDED) - cpm_export_variables(${CPM_ARGS_NAME}) - return() - endif() - - cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS}) - - if(NOT CPM_PACKAGE_FOUND) - CPMAddPackage(${ARGN}) - cpm_export_variables(${CPM_ARGS_NAME}) - endif() - -endfunction() - -# checks if a package has been added before -function(cpm_check_if_package_already_added CPM_ARGS_NAME CPM_ARGS_VERSION) - if("${CPM_ARGS_NAME}" IN_LIST CPM_PACKAGES) - CPMGetPackageVersion(${CPM_ARGS_NAME} CPM_PACKAGE_VERSION) - if("${CPM_PACKAGE_VERSION}" VERSION_LESS "${CPM_ARGS_VERSION}") - message( - WARNING - "${CPM_INDENT} Requires a newer version of ${CPM_ARGS_NAME} (${CPM_ARGS_VERSION}) than currently included (${CPM_PACKAGE_VERSION})." - ) - endif() - cpm_get_fetch_properties(${CPM_ARGS_NAME}) - set(${CPM_ARGS_NAME}_ADDED NO) - set(CPM_PACKAGE_ALREADY_ADDED - YES - PARENT_SCOPE) - cpm_export_variables(${CPM_ARGS_NAME}) - else() - set(CPM_PACKAGE_ALREADY_ADDED - NO - PARENT_SCOPE) - endif() -endfunction() - -# Parse the argument of CPMAddPackage in case a single one was provided and convert it to a list of -# arguments which can then be parsed idiomatically. For example gh:foo/bar@1.2.3 will be converted -# to: GITHUB_REPOSITORY;foo/bar;VERSION;1.2.3 -function(cpm_parse_add_package_single_arg arg outArgs) - # Look for a scheme - if("${arg}" MATCHES "^([a-zA-Z]+):(.+)$") - string(TOLOWER "${CMAKE_MATCH_1}" scheme) - set(uri "${CMAKE_MATCH_2}") - - # Check for CPM-specific schemes - if(scheme STREQUAL "gh") - set(out "GITHUB_REPOSITORY;${uri}") - set(packageType "git") - elseif(scheme STREQUAL "gl") - set(out "GITLAB_REPOSITORY;${uri}") - set(packageType "git") - elseif(scheme STREQUAL "bb") - set(out "BITBUCKET_REPOSITORY;${uri}") - set(packageType "git") - # A CPM-specific scheme was not found. Looks like this is a generic URL so try to determine - # type - elseif(arg MATCHES ".git/?(@|#|$)") - set(out "GIT_REPOSITORY;${arg}") - set(packageType "git") - else() - # Fall back to a URL - set(out "URL;${arg}") - set(packageType "archive") - - # We could also check for SVN since FetchContent supports it, but SVN is so rare these days. - # We just won't bother with the additional complexity it will induce in this function. SVN is - # done by multi-arg - endif() - else() - if(arg MATCHES ".git/?(@|#|$)") - set(out "GIT_REPOSITORY;${arg}") - set(packageType "git") - else() - # Give up - message(FATAL_ERROR "${CPM_INDENT} Can't determine package type of '${arg}'") - endif() - endif() - - # For all packages we interpret @... as version. Only replace the last occurrence. Thus URIs - # containing '@' can be used - string(REGEX REPLACE "@([^@]+)$" ";VERSION;\\1" out "${out}") - - # Parse the rest according to package type - if(packageType STREQUAL "git") - # For git repos we interpret #... as a tag or branch or commit hash - string(REGEX REPLACE "#([^#]+)$" ";GIT_TAG;\\1" out "${out}") - elseif(packageType STREQUAL "archive") - # For archives we interpret #... as a URL hash. - string(REGEX REPLACE "#([^#]+)$" ";URL_HASH;\\1" out "${out}") - # We don't try to parse the version if it's not provided explicitly. cpm_get_version_from_url - # should do this at a later point - else() - # We should never get here. This is an assertion and hitting it means there's a bug in the code - # above. A packageType was set, but not handled by this if-else. - message(FATAL_ERROR "${CPM_INDENT} Unsupported package type '${packageType}' of '${arg}'") - endif() - - set(${outArgs} - ${out} - PARENT_SCOPE) -endfunction() - -# Check that the working directory for a git repo is clean -function(cpm_check_git_working_dir_is_clean repoPath gitTag isClean) - - find_package(Git REQUIRED) - - if(NOT GIT_EXECUTABLE) - # No git executable, assume directory is clean - set(${isClean} - TRUE - PARENT_SCOPE) - return() - endif() - - # check for uncommitted changes - execute_process( - COMMAND ${GIT_EXECUTABLE} status --porcelain - RESULT_VARIABLE resultGitStatus - OUTPUT_VARIABLE repoStatus - OUTPUT_STRIP_TRAILING_WHITESPACE ERROR_QUIET - WORKING_DIRECTORY ${repoPath}) - if(resultGitStatus) - # not supposed to happen, assume clean anyway - message(WARNING "${CPM_INDENT} Calling git status on folder ${repoPath} failed") - set(${isClean} - TRUE - PARENT_SCOPE) - return() - endif() - - if(NOT "${repoStatus}" STREQUAL "") - set(${isClean} - FALSE - PARENT_SCOPE) - return() - endif() - - # check for committed changes - execute_process( - COMMAND ${GIT_EXECUTABLE} diff -s --exit-code ${gitTag} - RESULT_VARIABLE resultGitDiff - OUTPUT_STRIP_TRAILING_WHITESPACE OUTPUT_QUIET - WORKING_DIRECTORY ${repoPath}) - - if(${resultGitDiff} EQUAL 0) - set(${isClean} - TRUE - PARENT_SCOPE) - else() - set(${isClean} - FALSE - PARENT_SCOPE) - endif() - -endfunction() - -# method to overwrite internal FetchContent properties, to allow using CPM.cmake to overload -# FetchContent calls. As these are internal cmake properties, this method should be used carefully -# and may need modification in future CMake versions. Source: -# https://github.com/Kitware/CMake/blob/dc3d0b5a0a7d26d43d6cfeb511e224533b5d188f/Modules/FetchContent.cmake#L1152 -function(cpm_override_fetchcontent contentName) - cmake_parse_arguments(PARSE_ARGV 1 arg "" "SOURCE_DIR;BINARY_DIR" "") - if(NOT "${arg_UNPARSED_ARGUMENTS}" STREQUAL "") - message(FATAL_ERROR "${CPM_INDENT} Unsupported arguments: ${arg_UNPARSED_ARGUMENTS}") - endif() - - string(TOLOWER ${contentName} contentNameLower) - set(prefix "_FetchContent_${contentNameLower}") - - set(propertyName "${prefix}_sourceDir") - define_property( - GLOBAL - PROPERTY ${propertyName} - BRIEF_DOCS "Internal implementation detail of FetchContent_Populate()" - FULL_DOCS "Details used by FetchContent_Populate() for ${contentName}") - set_property(GLOBAL PROPERTY ${propertyName} "${arg_SOURCE_DIR}") - - set(propertyName "${prefix}_binaryDir") - define_property( - GLOBAL - PROPERTY ${propertyName} - BRIEF_DOCS "Internal implementation detail of FetchContent_Populate()" - FULL_DOCS "Details used by FetchContent_Populate() for ${contentName}") - set_property(GLOBAL PROPERTY ${propertyName} "${arg_BINARY_DIR}") - - set(propertyName "${prefix}_populated") - define_property( - GLOBAL - PROPERTY ${propertyName} - BRIEF_DOCS "Internal implementation detail of FetchContent_Populate()" - FULL_DOCS "Details used by FetchContent_Populate() for ${contentName}") - set_property(GLOBAL PROPERTY ${propertyName} TRUE) -endfunction() - -# Download and add a package from source -function(CPMAddPackage) - cpm_set_policies() - - list(LENGTH ARGN argnLength) - if(argnLength EQUAL 1) - cpm_parse_add_package_single_arg("${ARGN}" ARGN) - - # The shorthand syntax implies EXCLUDE_FROM_ALL and SYSTEM - set(ARGN "${ARGN};EXCLUDE_FROM_ALL;YES;SYSTEM;YES;") - endif() - - set(oneValueArgs - NAME - FORCE - VERSION - GIT_TAG - DOWNLOAD_ONLY - GITHUB_REPOSITORY - GITLAB_REPOSITORY - BITBUCKET_REPOSITORY - GIT_REPOSITORY - SOURCE_DIR - FIND_PACKAGE_ARGUMENTS - NO_CACHE - SYSTEM - GIT_SHALLOW - EXCLUDE_FROM_ALL - SOURCE_SUBDIR) - - set(multiValueArgs URL OPTIONS DOWNLOAD_COMMAND) - - cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "${multiValueArgs}" "${ARGN}") - - # Set default values for arguments - - if(NOT DEFINED CPM_ARGS_VERSION) - if(DEFINED CPM_ARGS_GIT_TAG) - cpm_get_version_from_git_tag("${CPM_ARGS_GIT_TAG}" CPM_ARGS_VERSION) - endif() - endif() - - if(CPM_ARGS_DOWNLOAD_ONLY) - set(DOWNLOAD_ONLY ${CPM_ARGS_DOWNLOAD_ONLY}) - else() - set(DOWNLOAD_ONLY NO) - endif() - - if(DEFINED CPM_ARGS_GITHUB_REPOSITORY) - set(CPM_ARGS_GIT_REPOSITORY "https://github.com/${CPM_ARGS_GITHUB_REPOSITORY}.git") - elseif(DEFINED CPM_ARGS_GITLAB_REPOSITORY) - set(CPM_ARGS_GIT_REPOSITORY "https://gitlab.com/${CPM_ARGS_GITLAB_REPOSITORY}.git") - elseif(DEFINED CPM_ARGS_BITBUCKET_REPOSITORY) - set(CPM_ARGS_GIT_REPOSITORY "https://bitbucket.org/${CPM_ARGS_BITBUCKET_REPOSITORY}.git") - endif() - - if(DEFINED CPM_ARGS_GIT_REPOSITORY) - list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_REPOSITORY ${CPM_ARGS_GIT_REPOSITORY}) - if(NOT DEFINED CPM_ARGS_GIT_TAG) - set(CPM_ARGS_GIT_TAG v${CPM_ARGS_VERSION}) - endif() - - # If a name wasn't provided, try to infer it from the git repo - if(NOT DEFINED CPM_ARGS_NAME) - cpm_package_name_from_git_uri(${CPM_ARGS_GIT_REPOSITORY} CPM_ARGS_NAME) - endif() - endif() - - set(CPM_SKIP_FETCH FALSE) - - if(DEFINED CPM_ARGS_GIT_TAG) - list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_TAG ${CPM_ARGS_GIT_TAG}) - # If GIT_SHALLOW is explicitly specified, honor the value. - if(DEFINED CPM_ARGS_GIT_SHALLOW) - list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_SHALLOW ${CPM_ARGS_GIT_SHALLOW}) - endif() - endif() - - if(DEFINED CPM_ARGS_URL) - # If a name or version aren't provided, try to infer them from the URL - list(GET CPM_ARGS_URL 0 firstUrl) - cpm_package_name_and_ver_from_url(${firstUrl} nameFromUrl verFromUrl) - # If we fail to obtain name and version from the first URL, we could try other URLs if any. - # However multiple URLs are expected to be quite rare, so for now we won't bother. - - # If the caller provided their own name and version, they trump the inferred ones. - if(NOT DEFINED CPM_ARGS_NAME) - set(CPM_ARGS_NAME ${nameFromUrl}) - endif() - if(NOT DEFINED CPM_ARGS_VERSION) - set(CPM_ARGS_VERSION ${verFromUrl}) - endif() - - list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS URL "${CPM_ARGS_URL}") - endif() - - # Check for required arguments - - if(NOT DEFINED CPM_ARGS_NAME) - message( - FATAL_ERROR - "${CPM_INDENT} 'NAME' was not provided and couldn't be automatically inferred for package added with arguments: '${ARGN}'" - ) - endif() - - # Check if package has been added before - cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}") - if(CPM_PACKAGE_ALREADY_ADDED) - cpm_export_variables(${CPM_ARGS_NAME}) - return() - endif() - - # Check for manual overrides - if(NOT CPM_ARGS_FORCE AND NOT "${CPM_${CPM_ARGS_NAME}_SOURCE}" STREQUAL "") - set(PACKAGE_SOURCE ${CPM_${CPM_ARGS_NAME}_SOURCE}) - set(CPM_${CPM_ARGS_NAME}_SOURCE "") - CPMAddPackage( - NAME "${CPM_ARGS_NAME}" - SOURCE_DIR "${PACKAGE_SOURCE}" - EXCLUDE_FROM_ALL "${CPM_ARGS_EXCLUDE_FROM_ALL}" - SYSTEM "${CPM_ARGS_SYSTEM}" - OPTIONS "${CPM_ARGS_OPTIONS}" - SOURCE_SUBDIR "${CPM_ARGS_SOURCE_SUBDIR}" - DOWNLOAD_ONLY "${DOWNLOAD_ONLY}" - FORCE True) - cpm_export_variables(${CPM_ARGS_NAME}) - return() - endif() - - # Check for available declaration - if(NOT CPM_ARGS_FORCE AND NOT "${CPM_DECLARATION_${CPM_ARGS_NAME}}" STREQUAL "") - set(declaration ${CPM_DECLARATION_${CPM_ARGS_NAME}}) - set(CPM_DECLARATION_${CPM_ARGS_NAME} "") - CPMAddPackage(${declaration}) - cpm_export_variables(${CPM_ARGS_NAME}) - # checking again to ensure version and option compatibility - cpm_check_if_package_already_added(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}") - return() - endif() - - if(NOT CPM_ARGS_FORCE) - if(CPM_USE_LOCAL_PACKAGES OR CPM_LOCAL_PACKAGES_ONLY) - cpm_find_package(${CPM_ARGS_NAME} "${CPM_ARGS_VERSION}" ${CPM_ARGS_FIND_PACKAGE_ARGUMENTS}) - - if(CPM_PACKAGE_FOUND) - cpm_export_variables(${CPM_ARGS_NAME}) - return() - endif() - - if(CPM_LOCAL_PACKAGES_ONLY) - message( - SEND_ERROR - "${CPM_INDENT} ${CPM_ARGS_NAME} not found via find_package(${CPM_ARGS_NAME} ${CPM_ARGS_VERSION})" - ) - endif() - endif() - endif() - - CPMRegisterPackage("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}") - - if(DEFINED CPM_ARGS_GIT_TAG) - set(PACKAGE_INFO "${CPM_ARGS_GIT_TAG}") - elseif(DEFINED CPM_ARGS_SOURCE_DIR) - set(PACKAGE_INFO "${CPM_ARGS_SOURCE_DIR}") - else() - set(PACKAGE_INFO "${CPM_ARGS_VERSION}") - endif() - - if(DEFINED FETCHCONTENT_BASE_DIR) - # respect user's FETCHCONTENT_BASE_DIR if set - set(CPM_FETCHCONTENT_BASE_DIR ${FETCHCONTENT_BASE_DIR}) - else() - set(CPM_FETCHCONTENT_BASE_DIR ${CMAKE_BINARY_DIR}/_deps) - endif() - - if(DEFINED CPM_ARGS_DOWNLOAD_COMMAND) - list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS DOWNLOAD_COMMAND ${CPM_ARGS_DOWNLOAD_COMMAND}) - elseif(DEFINED CPM_ARGS_SOURCE_DIR) - list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS SOURCE_DIR ${CPM_ARGS_SOURCE_DIR}) - if(NOT IS_ABSOLUTE ${CPM_ARGS_SOURCE_DIR}) - # Expand `CPM_ARGS_SOURCE_DIR` relative path. This is important because EXISTS doesn't work - # for relative paths. - get_filename_component(source_directory ${CPM_ARGS_SOURCE_DIR} REALPATH BASE_DIR - ${CMAKE_CURRENT_BINARY_DIR}) - else() - set(source_directory ${CPM_ARGS_SOURCE_DIR}) - endif() - if(NOT EXISTS ${source_directory}) - string(TOLOWER ${CPM_ARGS_NAME} lower_case_name) - # remove timestamps so CMake will re-download the dependency - file(REMOVE_RECURSE "${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-subbuild") - endif() - elseif(CPM_SOURCE_CACHE AND NOT CPM_ARGS_NO_CACHE) - string(TOLOWER ${CPM_ARGS_NAME} lower_case_name) - set(origin_parameters ${CPM_ARGS_UNPARSED_ARGUMENTS}) - list(SORT origin_parameters) - if(CPM_USE_NAMED_CACHE_DIRECTORIES) - string(SHA1 origin_hash "${origin_parameters};NEW_CACHE_STRUCTURE_TAG") - set(download_directory ${CPM_SOURCE_CACHE}/${lower_case_name}/${origin_hash}/${CPM_ARGS_NAME}) - else() - string(SHA1 origin_hash "${origin_parameters}") - set(download_directory ${CPM_SOURCE_CACHE}/${lower_case_name}/${origin_hash}) - endif() - # Expand `download_directory` relative path. This is important because EXISTS doesn't work for - # relative paths. - get_filename_component(download_directory ${download_directory} ABSOLUTE) - list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS SOURCE_DIR ${download_directory}) - - if(CPM_SOURCE_CACHE) - file(LOCK ${download_directory}/../cmake.lock) - endif() - - if(EXISTS ${download_directory}) - if(CPM_SOURCE_CACHE) - file(LOCK ${download_directory}/../cmake.lock RELEASE) - endif() - - cpm_store_fetch_properties(${CPM_ARGS_NAME} "${download_directory}" - "${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-build") - cpm_get_fetch_properties("${CPM_ARGS_NAME}") - - if(DEFINED CPM_ARGS_GIT_TAG AND NOT (PATCH_COMMAND IN_LIST CPM_ARGS_UNPARSED_ARGUMENTS)) - # warn if cache has been changed since checkout - cpm_check_git_working_dir_is_clean(${download_directory} ${CPM_ARGS_GIT_TAG} IS_CLEAN) - if(NOT ${IS_CLEAN}) - message( - WARNING "${CPM_INDENT} Cache for ${CPM_ARGS_NAME} (${download_directory}) is dirty") - endif() - endif() - - cpm_add_subdirectory( - "${CPM_ARGS_NAME}" - "${DOWNLOAD_ONLY}" - "${${CPM_ARGS_NAME}_SOURCE_DIR}/${CPM_ARGS_SOURCE_SUBDIR}" - "${${CPM_ARGS_NAME}_BINARY_DIR}" - "${CPM_ARGS_EXCLUDE_FROM_ALL}" - "${CPM_ARGS_SYSTEM}" - "${CPM_ARGS_OPTIONS}") - set(PACKAGE_INFO "${PACKAGE_INFO} at ${download_directory}") - - # As the source dir is already cached/populated, we override the call to FetchContent. - set(CPM_SKIP_FETCH TRUE) - cpm_override_fetchcontent( - "${lower_case_name}" SOURCE_DIR "${${CPM_ARGS_NAME}_SOURCE_DIR}/${CPM_ARGS_SOURCE_SUBDIR}" - BINARY_DIR "${${CPM_ARGS_NAME}_BINARY_DIR}") - - else() - # Enable shallow clone when GIT_TAG is not a commit hash. Our guess may not be accurate, but - # it should guarantee no commit hash get mis-detected. - if(NOT DEFINED CPM_ARGS_GIT_SHALLOW) - cpm_is_git_tag_commit_hash("${CPM_ARGS_GIT_TAG}" IS_HASH) - if(NOT ${IS_HASH}) - list(APPEND CPM_ARGS_UNPARSED_ARGUMENTS GIT_SHALLOW TRUE) - endif() - endif() - - # remove timestamps so CMake will re-download the dependency - file(REMOVE_RECURSE ${CPM_FETCHCONTENT_BASE_DIR}/${lower_case_name}-subbuild) - set(PACKAGE_INFO "${PACKAGE_INFO} to ${download_directory}") - endif() - endif() - - cpm_create_module_file(${CPM_ARGS_NAME} "CPMAddPackage(\"${ARGN}\")") - - if(CPM_PACKAGE_LOCK_ENABLED) - if((CPM_ARGS_VERSION AND NOT CPM_ARGS_SOURCE_DIR) OR CPM_INCLUDE_ALL_IN_PACKAGE_LOCK) - cpm_add_to_package_lock(${CPM_ARGS_NAME} "${ARGN}") - elseif(CPM_ARGS_SOURCE_DIR) - cpm_add_comment_to_package_lock(${CPM_ARGS_NAME} "local directory") - else() - cpm_add_comment_to_package_lock(${CPM_ARGS_NAME} "${ARGN}") - endif() - endif() - - cpm_message(STATUS - "${CPM_INDENT} Adding package ${CPM_ARGS_NAME}@${CPM_ARGS_VERSION} (${PACKAGE_INFO})") - - if(NOT CPM_SKIP_FETCH) - cpm_declare_fetch("${CPM_ARGS_NAME}" "${CPM_ARGS_VERSION}" "${PACKAGE_INFO}" - "${CPM_ARGS_UNPARSED_ARGUMENTS}") - cpm_fetch_package("${CPM_ARGS_NAME}" populated) - if(CPM_SOURCE_CACHE AND download_directory) - file(LOCK ${download_directory}/../cmake.lock RELEASE) - endif() - if(${populated}) - cpm_add_subdirectory( - "${CPM_ARGS_NAME}" - "${DOWNLOAD_ONLY}" - "${${CPM_ARGS_NAME}_SOURCE_DIR}/${CPM_ARGS_SOURCE_SUBDIR}" - "${${CPM_ARGS_NAME}_BINARY_DIR}" - "${CPM_ARGS_EXCLUDE_FROM_ALL}" - "${CPM_ARGS_SYSTEM}" - "${CPM_ARGS_OPTIONS}") - endif() - cpm_get_fetch_properties("${CPM_ARGS_NAME}") - endif() - - set(${CPM_ARGS_NAME}_ADDED YES) - cpm_export_variables("${CPM_ARGS_NAME}") -endfunction() - -# Fetch a previously declared package -macro(CPMGetPackage Name) - if(DEFINED "CPM_DECLARATION_${Name}") - CPMAddPackage(NAME ${Name}) - else() - message(SEND_ERROR "${CPM_INDENT} Cannot retrieve package ${Name}: no declaration available") - endif() -endmacro() - -# export variables available to the caller to the parent scope expects ${CPM_ARGS_NAME} to be set -macro(cpm_export_variables name) - set(${name}_SOURCE_DIR - "${${name}_SOURCE_DIR}" - PARENT_SCOPE) - set(${name}_BINARY_DIR - "${${name}_BINARY_DIR}" - PARENT_SCOPE) - set(${name}_ADDED - "${${name}_ADDED}" - PARENT_SCOPE) - set(CPM_LAST_PACKAGE_NAME - "${name}" - PARENT_SCOPE) -endmacro() - -# declares a package, so that any call to CPMAddPackage for the package name will use these -# arguments instead. Previous declarations will not be overridden. -macro(CPMDeclarePackage Name) - if(NOT DEFINED "CPM_DECLARATION_${Name}") - set("CPM_DECLARATION_${Name}" "${ARGN}") - endif() -endmacro() - -function(cpm_add_to_package_lock Name) - if(NOT CPM_DONT_CREATE_PACKAGE_LOCK) - cpm_prettify_package_arguments(PRETTY_ARGN false ${ARGN}) - file(APPEND ${CPM_PACKAGE_LOCK_FILE} "# ${Name}\nCPMDeclarePackage(${Name}\n${PRETTY_ARGN})\n") - endif() -endfunction() - -function(cpm_add_comment_to_package_lock Name) - if(NOT CPM_DONT_CREATE_PACKAGE_LOCK) - cpm_prettify_package_arguments(PRETTY_ARGN true ${ARGN}) - file(APPEND ${CPM_PACKAGE_LOCK_FILE} - "# ${Name} (unversioned)\n# CPMDeclarePackage(${Name}\n${PRETTY_ARGN}#)\n") - endif() -endfunction() - -# includes the package lock file if it exists and creates a target `cpm-update-package-lock` to -# update it -macro(CPMUsePackageLock file) - if(NOT CPM_DONT_CREATE_PACKAGE_LOCK) - get_filename_component(CPM_ABSOLUTE_PACKAGE_LOCK_PATH ${file} ABSOLUTE) - if(EXISTS ${CPM_ABSOLUTE_PACKAGE_LOCK_PATH}) - include(${CPM_ABSOLUTE_PACKAGE_LOCK_PATH}) - endif() - if(NOT TARGET cpm-update-package-lock) - add_custom_target( - cpm-update-package-lock COMMAND ${CMAKE_COMMAND} -E copy ${CPM_PACKAGE_LOCK_FILE} - ${CPM_ABSOLUTE_PACKAGE_LOCK_PATH}) - endif() - set(CPM_PACKAGE_LOCK_ENABLED true) - endif() -endmacro() - -# registers a package that has been added to CPM -function(CPMRegisterPackage PACKAGE VERSION) - list(APPEND CPM_PACKAGES ${PACKAGE}) - set(CPM_PACKAGES - ${CPM_PACKAGES} - CACHE INTERNAL "") - set("CPM_PACKAGE_${PACKAGE}_VERSION" - ${VERSION} - CACHE INTERNAL "") -endfunction() - -# retrieve the current version of the package to ${OUTPUT} -function(CPMGetPackageVersion PACKAGE OUTPUT) - set(${OUTPUT} - "${CPM_PACKAGE_${PACKAGE}_VERSION}" - PARENT_SCOPE) -endfunction() - -# declares a package in FetchContent_Declare -function(cpm_declare_fetch PACKAGE VERSION INFO) - if(${CPM_DRY_RUN}) - cpm_message(STATUS "${CPM_INDENT} Package not declared (dry run)") - return() - endif() - - FetchContent_Declare(${PACKAGE} ${ARGN}) -endfunction() - -# returns properties for a package previously defined by cpm_declare_fetch -function(cpm_get_fetch_properties PACKAGE) - if(${CPM_DRY_RUN}) - return() - endif() - - set(${PACKAGE}_SOURCE_DIR - "${CPM_PACKAGE_${PACKAGE}_SOURCE_DIR}" - PARENT_SCOPE) - set(${PACKAGE}_BINARY_DIR - "${CPM_PACKAGE_${PACKAGE}_BINARY_DIR}" - PARENT_SCOPE) -endfunction() - -function(cpm_store_fetch_properties PACKAGE source_dir binary_dir) - if(${CPM_DRY_RUN}) - return() - endif() - - set(CPM_PACKAGE_${PACKAGE}_SOURCE_DIR - "${source_dir}" - CACHE INTERNAL "") - set(CPM_PACKAGE_${PACKAGE}_BINARY_DIR - "${binary_dir}" - CACHE INTERNAL "") -endfunction() - -# adds a package as a subdirectory if viable, according to provided options -function( - cpm_add_subdirectory - PACKAGE - DOWNLOAD_ONLY - SOURCE_DIR - BINARY_DIR - EXCLUDE - SYSTEM - OPTIONS) - - if(NOT DOWNLOAD_ONLY AND EXISTS ${SOURCE_DIR}/CMakeLists.txt) - set(addSubdirectoryExtraArgs "") - if(EXCLUDE) - list(APPEND addSubdirectoryExtraArgs EXCLUDE_FROM_ALL) - endif() - if("${SYSTEM}" AND "${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.25") - # https://cmake.org/cmake/help/latest/prop_dir/SYSTEM.html#prop_dir:SYSTEM - list(APPEND addSubdirectoryExtraArgs SYSTEM) - endif() - if(OPTIONS) - foreach(OPTION ${OPTIONS}) - cpm_parse_option("${OPTION}") - set(${OPTION_KEY} "${OPTION_VALUE}") - endforeach() - endif() - set(CPM_OLD_INDENT "${CPM_INDENT}") - set(CPM_INDENT "${CPM_INDENT} ${PACKAGE}:") - add_subdirectory(${SOURCE_DIR} ${BINARY_DIR} ${addSubdirectoryExtraArgs}) - set(CPM_INDENT "${CPM_OLD_INDENT}") - endif() -endfunction() - -# downloads a previously declared package via FetchContent and exports the variables -# `${PACKAGE}_SOURCE_DIR` and `${PACKAGE}_BINARY_DIR` to the parent scope -function(cpm_fetch_package PACKAGE populated) - set(${populated} - FALSE - PARENT_SCOPE) - if(${CPM_DRY_RUN}) - cpm_message(STATUS "${CPM_INDENT} Package ${PACKAGE} not fetched (dry run)") - return() - endif() - - FetchContent_GetProperties(${PACKAGE}) - - string(TOLOWER "${PACKAGE}" lower_case_name) - - if(NOT ${lower_case_name}_POPULATED) - FetchContent_Populate(${PACKAGE}) - set(${populated} - TRUE - PARENT_SCOPE) - endif() - - cpm_store_fetch_properties(${CPM_ARGS_NAME} ${${lower_case_name}_SOURCE_DIR} - ${${lower_case_name}_BINARY_DIR}) - - set(${PACKAGE}_SOURCE_DIR - ${${lower_case_name}_SOURCE_DIR} - PARENT_SCOPE) - set(${PACKAGE}_BINARY_DIR - ${${lower_case_name}_BINARY_DIR} - PARENT_SCOPE) -endfunction() - -# splits a package option -function(cpm_parse_option OPTION) - string(REGEX MATCH "^[^ ]+" OPTION_KEY "${OPTION}") - string(LENGTH "${OPTION}" OPTION_LENGTH) - string(LENGTH "${OPTION_KEY}" OPTION_KEY_LENGTH) - if(OPTION_KEY_LENGTH STREQUAL OPTION_LENGTH) - # no value for key provided, assume user wants to set option to "ON" - set(OPTION_VALUE "ON") - else() - math(EXPR OPTION_KEY_LENGTH "${OPTION_KEY_LENGTH}+1") - string(SUBSTRING "${OPTION}" "${OPTION_KEY_LENGTH}" "-1" OPTION_VALUE) - endif() - set(OPTION_KEY - "${OPTION_KEY}" - PARENT_SCOPE) - set(OPTION_VALUE - "${OPTION_VALUE}" - PARENT_SCOPE) -endfunction() - -# guesses the package version from a git tag -function(cpm_get_version_from_git_tag GIT_TAG RESULT) - string(LENGTH ${GIT_TAG} length) - if(length EQUAL 40) - # GIT_TAG is probably a git hash - set(${RESULT} - 0 - PARENT_SCOPE) - else() - string(REGEX MATCH "v?([0123456789.]*).*" _ ${GIT_TAG}) - set(${RESULT} - ${CMAKE_MATCH_1} - PARENT_SCOPE) - endif() -endfunction() - -# guesses if the git tag is a commit hash or an actual tag or a branch name. -function(cpm_is_git_tag_commit_hash GIT_TAG RESULT) - string(LENGTH "${GIT_TAG}" length) - # full hash has 40 characters, and short hash has at least 7 characters. - if(length LESS 7 OR length GREATER 40) - set(${RESULT} - 0 - PARENT_SCOPE) - else() - if(${GIT_TAG} MATCHES "^[a-fA-F0-9]+$") - set(${RESULT} - 1 - PARENT_SCOPE) - else() - set(${RESULT} - 0 - PARENT_SCOPE) - endif() - endif() -endfunction() - -function(cpm_prettify_package_arguments OUT_VAR IS_IN_COMMENT) - set(oneValueArgs - NAME - FORCE - VERSION - GIT_TAG - DOWNLOAD_ONLY - GITHUB_REPOSITORY - GITLAB_REPOSITORY - BITBUCKET_REPOSITORY - GIT_REPOSITORY - SOURCE_DIR - FIND_PACKAGE_ARGUMENTS - NO_CACHE - SYSTEM - GIT_SHALLOW - EXCLUDE_FROM_ALL - SOURCE_SUBDIR) - set(multiValueArgs URL OPTIONS DOWNLOAD_COMMAND) - cmake_parse_arguments(CPM_ARGS "" "${oneValueArgs}" "${multiValueArgs}" ${ARGN}) - - foreach(oneArgName ${oneValueArgs}) - if(DEFINED CPM_ARGS_${oneArgName}) - if(${IS_IN_COMMENT}) - string(APPEND PRETTY_OUT_VAR "#") - endif() - if(${oneArgName} STREQUAL "SOURCE_DIR") - string(REPLACE ${CMAKE_SOURCE_DIR} "\${CMAKE_SOURCE_DIR}" CPM_ARGS_${oneArgName} - ${CPM_ARGS_${oneArgName}}) - endif() - string(APPEND PRETTY_OUT_VAR " ${oneArgName} ${CPM_ARGS_${oneArgName}}\n") - endif() - endforeach() - foreach(multiArgName ${multiValueArgs}) - if(DEFINED CPM_ARGS_${multiArgName}) - if(${IS_IN_COMMENT}) - string(APPEND PRETTY_OUT_VAR "#") - endif() - string(APPEND PRETTY_OUT_VAR " ${multiArgName}\n") - foreach(singleOption ${CPM_ARGS_${multiArgName}}) - if(${IS_IN_COMMENT}) - string(APPEND PRETTY_OUT_VAR "#") - endif() - string(APPEND PRETTY_OUT_VAR " \"${singleOption}\"\n") - endforeach() - endif() - endforeach() - - if(NOT "${CPM_ARGS_UNPARSED_ARGUMENTS}" STREQUAL "") - if(${IS_IN_COMMENT}) - string(APPEND PRETTY_OUT_VAR "#") - endif() - string(APPEND PRETTY_OUT_VAR " ") - foreach(CPM_ARGS_UNPARSED_ARGUMENT ${CPM_ARGS_UNPARSED_ARGUMENTS}) - string(APPEND PRETTY_OUT_VAR " ${CPM_ARGS_UNPARSED_ARGUMENT}") - endforeach() - string(APPEND PRETTY_OUT_VAR "\n") - endif() +# Expand relative path. This is important if the provided path contains a tilde (~) +get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE) - set(${OUT_VAR} - ${PRETTY_OUT_VAR} - PARENT_SCOPE) +file(DOWNLOAD + https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake + ${CPM_DOWNLOAD_LOCATION} EXPECTED_HASH SHA256=${CPM_HASH_SUM}) -endfunction() +include(${CPM_DOWNLOAD_LOCATION}) From 6dbe9991d9c91c3ec322dc049bc150d3540b72f1 Mon Sep 17 00:00:00 2001 From: Curve Date: Wed, 29 Nov 2023 16:00:25 +0100 Subject: [PATCH 32/41] refactor(cmake): lower required vtk version * This should also fix the windows workflows as we've switched to a commit that includes upstream!10542 --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d22ad626..7bb8f54b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,9 @@ target_link_libraries(${PROJECT_NAME} INTERFACE OpenMP::OpenMP_CXX ViennaHRLE) if(VIENNALS_USE_VTK) CPMAddPackage( NAME VTK - VERSION 9.3.0 + # TODO: Change to 9.3.1 as soon as it's released (https://github.com/ViennaTools/ViennaLS/pull/99#issuecomment-1832053715) + GIT_TAG 99bd602bdbe8024c55e8382f7cf1013d42a14601 + VERSION 9.0.0 GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk" OPTIONS "VTK_LEGACY_REMOVE ON" "VTK_SMP_IMPLEMENTATION_TYPE \"OpenMP\"" From 5af2536d1f8b2af416e76970c79845cbf53ea21e Mon Sep 17 00:00:00 2001 From: Curve Date: Wed, 29 Nov 2023 16:01:10 +0100 Subject: [PATCH 33/41] fix: formatting --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 7bb8f54b..94b3105d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -96,7 +96,8 @@ target_link_libraries(${PROJECT_NAME} INTERFACE OpenMP::OpenMP_CXX ViennaHRLE) if(VIENNALS_USE_VTK) CPMAddPackage( NAME VTK - # TODO: Change to 9.3.1 as soon as it's released (https://github.com/ViennaTools/ViennaLS/pull/99#issuecomment-1832053715) + # TODO: Change to 9.3.1 as soon as it's released + # (https://github.com/ViennaTools/ViennaLS/pull/99#issuecomment-1832053715) GIT_TAG 99bd602bdbe8024c55e8382f7cf1013d42a14601 VERSION 9.0.0 GIT_REPOSITORY "https://gitlab.kitware.com/vtk/vtk" From 5b3f3094f911cdfcc69f807cd3ab5b512f7aa9bd Mon Sep 17 00:00:00 2001 From: Curve Date: Sat, 2 Dec 2023 17:13:14 +0100 Subject: [PATCH 34/41] fix: setup vtk env for targets --- CMakeLists.txt | 30 +++++++++---------- Examples/AirGapDeposition/CMakeLists.txt | 2 +- Examples/CMakeLists.txt | 7 +++++ Examples/Deposition/CMakeLists.txt | 2 +- Examples/GeometricAdvection/CMakeLists.txt | 2 +- Examples/PatternedSubstrate/CMakeLists.txt | 2 +- Examples/PeriodicBoundary/CMakeLists.txt | 2 +- Examples/SharedLib/CMakeLists.txt | 2 +- Examples/SquareEtch/CMakeLists.txt | 2 +- Examples/VoidEtching/CMakeLists.txt | 2 +- Examples/VolumeToLevelSets/CMakeLists.txt | 2 +- Python/CMakeLists.txt | 17 ++++++++++- Tests/Advection/CMakeLists.txt | 1 + Tests/Advection2D/CMakeLists.txt | 1 + Tests/AdvectionBenchmark/CMakeLists.txt | 1 + Tests/AdvectionPlane/CMakeLists.txt | 1 + Tests/BooleanOperation/CMakeLists.txt | 1 + .../BooleanOperationExactZero/CMakeLists.txt | 1 + .../BooleanOperationExactZero1/CMakeLists.txt | 1 + Tests/BoundaryConditions/CMakeLists.txt | 1 + Tests/CMakeLists.txt | 7 +++++ Tests/CalculateCurvatures/CMakeLists.txt | 1 + Tests/CalculateNormalVectors/CMakeLists.txt | 1 + Tests/ConvexHull/CMakeLists.txt | 1 + Tests/ConvexHull3D/CMakeLists.txt | 1 + Tests/DiskMesh/CMakeLists.txt | 1 + Tests/Expand/CMakeLists.txt | 1 + Tests/Extrude/CMakeLists.txt | 1 + Tests/FeatureDetection/CMakeLists.txt | 1 + Tests/FileWriter/CMakeLists.txt | 1 + Tests/FromMesh/CMakeLists.txt | 1 + Tests/GenerateHoleGeometry/CMakeLists.txt | 1 + Tests/GeometricAdvect/CMakeLists.txt | 1 + Tests/GeometricAdvectMask/CMakeLists.txt | 1 + .../GeometricAdvectPerformance/CMakeLists.txt | 1 + Tests/GeometricAdvectTrench/CMakeLists.txt | 1 + Tests/HullMesh/CMakeLists.txt | 1 + Tests/Make3DSphere/CMakeLists.txt | 1 + Tests/MakeBox/CMakeLists.txt | 1 + Tests/MakeGeometry/CMakeLists.txt | 1 + Tests/MakePlane/CMakeLists.txt | 1 + Tests/MakeSphere/CMakeLists.txt | 1 + Tests/MarkVoidPoints/CMakeLists.txt | 1 + Tests/MultiMaterialAdvection/CMakeLists.txt | 1 + Tests/MultiMaterialEtch/CMakeLists.txt | 1 + Tests/PeriodicBoundary2D/CMakeLists.txt | 1 + Tests/ReadFromFile/CMakeLists.txt | 1 + Tests/ReadVolume/CMakeLists.txt | 1 + Tests/RemoveStrayPoints/CMakeLists.txt | 1 + Tests/RotateMesh/CMakeLists.txt | 1 + Tests/Serialize/CMakeLists.txt | 1 + Tests/SmartPointer/CMakeLists.txt | 1 + Tests/VisualizationMesh/CMakeLists.txt | 1 + Tests/VoidDetection/CMakeLists.txt | 1 + cmake/vtk.cmake | 9 ++++++ 55 files changed, 104 insertions(+), 25 deletions(-) create mode 100644 cmake/vtk.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 94b3105d..86b1b405 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,8 +49,6 @@ if((VIENNALS_ENABLE_SANITIZER AND CMAKE_BUILD_TYPE STREQUAL "Debug") OR VIENNALS message(STATUS "[ViennaLS] Using Sanitizer") endif() -set(CPM_USE_LOCAL_PACKAGES ON) - # -------------------------------------------------------------------------------------------------------- # Setup Library # -------------------------------------------------------------------------------------------------------- @@ -84,7 +82,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE "include") include("cmake/cpm.cmake") -CPMAddPackage( +CPMFindPackage( NAME ViennaHRLE GIT_TAG master GIT_REPOSITORY "https://github.com/ViennaTools/ViennaHRLE" @@ -94,7 +92,7 @@ find_package(OpenMP REQUIRED) target_link_libraries(${PROJECT_NAME} INTERFACE OpenMP::OpenMP_CXX ViennaHRLE) if(VIENNALS_USE_VTK) - CPMAddPackage( + CPMFindPackage( NAME VTK # TODO: Change to 9.3.1 as soon as it's released # (https://github.com/ViennaTools/ViennaLS/pull/99#issuecomment-1832053715) @@ -144,8 +142,10 @@ if(VIENNALS_USE_VTK) VTK::FiltersGeneral VTK::FiltersGeometry) - if(NOT VTK_DIR) - set(VTK_DIR "${VTK_BINARY_DIR}/lib") + if(MSVC) + set(VTK_LIBS "${VTK_BINARY_DIR}/bin/$") + else() + set(VTK_LIBS "${VTK_BINARY_DIR}/bin") endif() endif() @@ -168,15 +168,6 @@ if(VIENNALS_PRECOMPILE_HEADERS) set_target_properties(${PROJECT_NAME}Lib PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) endif() -# -------------------------------------------------------------------------------------------------------- -# Setup Python Bindings -# -------------------------------------------------------------------------------------------------------- - -if(VIENNALS_BUILD_PYTHON) - message(STATUS "[ViennaLS] Building Python Bindings") - add_subdirectory(Python) -endif() - # -------------------------------------------------------------------------------------------------------- # Setup Examples # -------------------------------------------------------------------------------------------------------- @@ -197,6 +188,15 @@ if(VIENNALS_BUILD_TESTS) add_subdirectory(Tests) endif() +# -------------------------------------------------------------------------------------------------------- +# Setup Python Bindings +# -------------------------------------------------------------------------------------------------------- + +if(VIENNALS_BUILD_PYTHON) + message(STATUS "[ViennaLS] Building Python Bindings") + add_subdirectory(Python) +endif() + # -------------------------------------------------------------------------------------------------------- # Install Target # -------------------------------------------------------------------------------------------------------- diff --git a/Examples/AirGapDeposition/CMakeLists.txt b/Examples/AirGapDeposition/CMakeLists.txt index 87c4dc22..9f4720e3 100644 --- a/Examples/AirGapDeposition/CMakeLists.txt +++ b/Examples/AirGapDeposition/CMakeLists.txt @@ -4,4 +4,4 @@ project(AirGapDeposition LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_test(NAME ${PROJECT_NAME} COMMAND $) +add_dependencies(ViennaLS_Examples ${PROJECT_NAME}) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index 6f0a173a..f686658c 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -1,3 +1,10 @@ +add_custom_target(ViennaLS_Examples ALL) + +if (NOT VTK_DIR) + include("../cmake/vtk.cmake") + setup_vtk_env(ViennaLS_Examples "examples") +endif() + file( GLOB entries LIST_DIRECTORIES true diff --git a/Examples/Deposition/CMakeLists.txt b/Examples/Deposition/CMakeLists.txt index 5fdcaa17..a435398a 100644 --- a/Examples/Deposition/CMakeLists.txt +++ b/Examples/Deposition/CMakeLists.txt @@ -4,4 +4,4 @@ project(Deposition LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_test(NAME ${PROJECT_NAME} COMMAND $) +add_dependencies(ViennaLS_Examples ${PROJECT_NAME}) diff --git a/Examples/GeometricAdvection/CMakeLists.txt b/Examples/GeometricAdvection/CMakeLists.txt index 2df1557c..8c848896 100644 --- a/Examples/GeometricAdvection/CMakeLists.txt +++ b/Examples/GeometricAdvection/CMakeLists.txt @@ -4,4 +4,4 @@ project(GeometricAdvection LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_test(NAME ${PROJECT_NAME} COMMAND $) +add_dependencies(ViennaLS_Examples ${PROJECT_NAME}) diff --git a/Examples/PatternedSubstrate/CMakeLists.txt b/Examples/PatternedSubstrate/CMakeLists.txt index 4eded8d2..8c82099c 100644 --- a/Examples/PatternedSubstrate/CMakeLists.txt +++ b/Examples/PatternedSubstrate/CMakeLists.txt @@ -4,4 +4,4 @@ project(PatternedSubstrate LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_test(NAME ${PROJECT_NAME} COMMAND $) +add_dependencies(ViennaLS_Examples ${PROJECT_NAME}) diff --git a/Examples/PeriodicBoundary/CMakeLists.txt b/Examples/PeriodicBoundary/CMakeLists.txt index beae9375..1c46a336 100644 --- a/Examples/PeriodicBoundary/CMakeLists.txt +++ b/Examples/PeriodicBoundary/CMakeLists.txt @@ -4,4 +4,4 @@ project(PeriodicBoundary LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_test(NAME ${PROJECT_NAME} COMMAND $) +add_dependencies(ViennaLS_Examples ${PROJECT_NAME}) diff --git a/Examples/SharedLib/CMakeLists.txt b/Examples/SharedLib/CMakeLists.txt index 69db0e2c..6a228609 100644 --- a/Examples/SharedLib/CMakeLists.txt +++ b/Examples/SharedLib/CMakeLists.txt @@ -4,4 +4,4 @@ project(SharedLib LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_test(NAME ${PROJECT_NAME} COMMAND $) +add_dependencies(ViennaLS_Examples ${PROJECT_NAME}) diff --git a/Examples/SquareEtch/CMakeLists.txt b/Examples/SquareEtch/CMakeLists.txt index f9b20d43..f96dc14f 100644 --- a/Examples/SquareEtch/CMakeLists.txt +++ b/Examples/SquareEtch/CMakeLists.txt @@ -4,4 +4,4 @@ project(SquareEtch LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_test(NAME ${PROJECT_NAME} COMMAND $) +add_dependencies(ViennaLS_Examples ${PROJECT_NAME}) diff --git a/Examples/VoidEtching/CMakeLists.txt b/Examples/VoidEtching/CMakeLists.txt index 44c1e6e4..c588eef5 100644 --- a/Examples/VoidEtching/CMakeLists.txt +++ b/Examples/VoidEtching/CMakeLists.txt @@ -4,4 +4,4 @@ project(VoidEtching LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_test(NAME ${PROJECT_NAME} COMMAND $) +add_dependencies(ViennaLS_Examples ${PROJECT_NAME}) diff --git a/Examples/VolumeToLevelSets/CMakeLists.txt b/Examples/VolumeToLevelSets/CMakeLists.txt index acf5a686..08b6e135 100644 --- a/Examples/VolumeToLevelSets/CMakeLists.txt +++ b/Examples/VolumeToLevelSets/CMakeLists.txt @@ -4,4 +4,4 @@ project(VolumeToLevelSets LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) -add_test(NAME ${PROJECT_NAME} COMMAND $) +add_dependencies(ViennaLS_Examples ${PROJECT_NAME}) diff --git a/Python/CMakeLists.txt b/Python/CMakeLists.txt index ac5a9520..ce91e2ed 100644 --- a/Python/CMakeLists.txt +++ b/Python/CMakeLists.txt @@ -1,6 +1,8 @@ cmake_minimum_required(VERSION 3.14) project(ViennaLSPython LANGUAGES CXX) +add_custom_target(${PROJECT_NAME} ALL) + # -------------------------------------------------------------------------------------------------------- # Setup Dependencies # -------------------------------------------------------------------------------------------------------- @@ -12,7 +14,7 @@ set(PYBIND11_PYTHON_VERSION 3 CACHE STRING "Python version") -CPMAddPackage( +CPMFindPackage( NAME pybind11 VERSION 2.11.1 GIT_REPOSITORY "https://github.com/pybind/pybind11") @@ -31,6 +33,17 @@ if(CMAKE_LIBRARY_OUTPUT_DIRECTORY) message(STATUS "[ViennaLS] Using Library Output Directory for bindings") endif() +# -------------------------------------------------------------------------------------------------------- +# VTK-Setup +# -------------------------------------------------------------------------------------------------------- + +include("../cmake/vtk.cmake") + +if(NOT VTK_DIR) + setup_vtk_env(${PROJECT_NAME} vtk_env) + set(VTK_DIR "${PROJECT_BINARY_DIR}/vtk_env") +endif() + # -------------------------------------------------------------------------------------------------------- # Setup 2D-Bindings # -------------------------------------------------------------------------------------------------------- @@ -39,6 +52,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${VIENNALS_LIBRARY_OUTPUT_DIR}/viennals2d) set(VIENNALS_PYTHON_MODULE_NAME_2D "_${VIENNALS_PYTHON_MODULE_NAME}2d") pybind11_add_module("${VIENNALS_PYTHON_MODULE_NAME_2D}" "pyWrap.cpp") +add_dependencies(${PROJECT_NAME} ${VIENNALS_PYTHON_MODULE_NAME_2D}) target_link_libraries(${VIENNALS_PYTHON_MODULE_NAME_2D} PUBLIC ViennaLS) target_compile_definitions( @@ -56,6 +70,7 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${VIENNALS_LIBRARY_OUTPUT_DIR}/viennals3d) set(VIENNALS_PYTHON_MODULE_NAME_3D "_${VIENNALS_PYTHON_MODULE_NAME}3d") pybind11_add_module("${VIENNALS_PYTHON_MODULE_NAME_3D}" "pyWrap.cpp") +add_dependencies(${PROJECT_NAME} ${VIENNALS_PYTHON_MODULE_NAME_3D}) target_link_libraries(${VIENNALS_PYTHON_MODULE_NAME_3D} PUBLIC ViennaLS) target_compile_definitions( diff --git a/Tests/Advection/CMakeLists.txt b/Tests/Advection/CMakeLists.txt index e82b214a..ca2709ab 100644 --- a/Tests/Advection/CMakeLists.txt +++ b/Tests/Advection/CMakeLists.txt @@ -4,4 +4,5 @@ project(Advection LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/Advection2D/CMakeLists.txt b/Tests/Advection2D/CMakeLists.txt index bfe681d6..0340d105 100644 --- a/Tests/Advection2D/CMakeLists.txt +++ b/Tests/Advection2D/CMakeLists.txt @@ -4,4 +4,5 @@ project(Advection2D LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/AdvectionBenchmark/CMakeLists.txt b/Tests/AdvectionBenchmark/CMakeLists.txt index 99cc0122..5bf0a1b6 100644 --- a/Tests/AdvectionBenchmark/CMakeLists.txt +++ b/Tests/AdvectionBenchmark/CMakeLists.txt @@ -4,4 +4,5 @@ project(AdvectionBenchmark LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/AdvectionPlane/CMakeLists.txt b/Tests/AdvectionPlane/CMakeLists.txt index ace9e016..41a62971 100644 --- a/Tests/AdvectionPlane/CMakeLists.txt +++ b/Tests/AdvectionPlane/CMakeLists.txt @@ -4,4 +4,5 @@ project(AdvectionPlane LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/BooleanOperation/CMakeLists.txt b/Tests/BooleanOperation/CMakeLists.txt index 6f7d02b1..8d616e83 100644 --- a/Tests/BooleanOperation/CMakeLists.txt +++ b/Tests/BooleanOperation/CMakeLists.txt @@ -4,4 +4,5 @@ project(BooleanOperation LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/BooleanOperationExactZero/CMakeLists.txt b/Tests/BooleanOperationExactZero/CMakeLists.txt index e224a071..d1d8d3fc 100644 --- a/Tests/BooleanOperationExactZero/CMakeLists.txt +++ b/Tests/BooleanOperationExactZero/CMakeLists.txt @@ -4,4 +4,5 @@ project(BooleanOperationExactZero LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/BooleanOperationExactZero1/CMakeLists.txt b/Tests/BooleanOperationExactZero1/CMakeLists.txt index 39336c1f..977cc7c1 100644 --- a/Tests/BooleanOperationExactZero1/CMakeLists.txt +++ b/Tests/BooleanOperationExactZero1/CMakeLists.txt @@ -4,4 +4,5 @@ project(BooleanOperationExactZero1 LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/BoundaryConditions/CMakeLists.txt b/Tests/BoundaryConditions/CMakeLists.txt index 0c6b23ab..93102210 100644 --- a/Tests/BoundaryConditions/CMakeLists.txt +++ b/Tests/BoundaryConditions/CMakeLists.txt @@ -4,4 +4,5 @@ project(BoundaryConditions LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 6f0a173a..50c2d635 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1,3 +1,10 @@ +add_custom_target(ViennaLS_Tests ALL) + +if (NOT VTK_DIR) + include("../cmake/vtk.cmake") + setup_vtk_env(ViennaLS_Tests "tests") +endif() + file( GLOB entries LIST_DIRECTORIES true diff --git a/Tests/CalculateCurvatures/CMakeLists.txt b/Tests/CalculateCurvatures/CMakeLists.txt index 1fa9d7af..f9c8e290 100644 --- a/Tests/CalculateCurvatures/CMakeLists.txt +++ b/Tests/CalculateCurvatures/CMakeLists.txt @@ -4,4 +4,5 @@ project(CalculateCurvatures LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/CalculateNormalVectors/CMakeLists.txt b/Tests/CalculateNormalVectors/CMakeLists.txt index f798850d..f9affb97 100644 --- a/Tests/CalculateNormalVectors/CMakeLists.txt +++ b/Tests/CalculateNormalVectors/CMakeLists.txt @@ -4,4 +4,5 @@ project(CalculateNormalVectors LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/ConvexHull/CMakeLists.txt b/Tests/ConvexHull/CMakeLists.txt index e9119411..58cd5ebf 100644 --- a/Tests/ConvexHull/CMakeLists.txt +++ b/Tests/ConvexHull/CMakeLists.txt @@ -4,4 +4,5 @@ project(ConvexHull LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/ConvexHull3D/CMakeLists.txt b/Tests/ConvexHull3D/CMakeLists.txt index 9e368bcf..12c10e8e 100644 --- a/Tests/ConvexHull3D/CMakeLists.txt +++ b/Tests/ConvexHull3D/CMakeLists.txt @@ -4,4 +4,5 @@ project(ConvexHull3D LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/DiskMesh/CMakeLists.txt b/Tests/DiskMesh/CMakeLists.txt index 9093599d..37fb69b4 100644 --- a/Tests/DiskMesh/CMakeLists.txt +++ b/Tests/DiskMesh/CMakeLists.txt @@ -4,4 +4,5 @@ project(DiskMesh LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/Expand/CMakeLists.txt b/Tests/Expand/CMakeLists.txt index abdf0cc6..6d7b1168 100644 --- a/Tests/Expand/CMakeLists.txt +++ b/Tests/Expand/CMakeLists.txt @@ -4,4 +4,5 @@ project(Expand LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/Extrude/CMakeLists.txt b/Tests/Extrude/CMakeLists.txt index cbed8d86..1bf6aa25 100644 --- a/Tests/Extrude/CMakeLists.txt +++ b/Tests/Extrude/CMakeLists.txt @@ -4,4 +4,5 @@ project(Extrude LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/FeatureDetection/CMakeLists.txt b/Tests/FeatureDetection/CMakeLists.txt index d2bf7865..5a3865f0 100644 --- a/Tests/FeatureDetection/CMakeLists.txt +++ b/Tests/FeatureDetection/CMakeLists.txt @@ -4,4 +4,5 @@ project(FeatureDetection LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/FileWriter/CMakeLists.txt b/Tests/FileWriter/CMakeLists.txt index 7271e9fd..82df8a96 100644 --- a/Tests/FileWriter/CMakeLists.txt +++ b/Tests/FileWriter/CMakeLists.txt @@ -4,4 +4,5 @@ project(FileWriter LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/FromMesh/CMakeLists.txt b/Tests/FromMesh/CMakeLists.txt index a2f7aae0..ecf583a8 100644 --- a/Tests/FromMesh/CMakeLists.txt +++ b/Tests/FromMesh/CMakeLists.txt @@ -4,4 +4,5 @@ project(FromMesh LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/GenerateHoleGeometry/CMakeLists.txt b/Tests/GenerateHoleGeometry/CMakeLists.txt index 69c56ef9..bb91fd84 100644 --- a/Tests/GenerateHoleGeometry/CMakeLists.txt +++ b/Tests/GenerateHoleGeometry/CMakeLists.txt @@ -4,4 +4,5 @@ project(GenerateHoleGeometry LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/GeometricAdvect/CMakeLists.txt b/Tests/GeometricAdvect/CMakeLists.txt index d353115b..f28f7178 100644 --- a/Tests/GeometricAdvect/CMakeLists.txt +++ b/Tests/GeometricAdvect/CMakeLists.txt @@ -4,4 +4,5 @@ project(GeometricAdvect LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/GeometricAdvectMask/CMakeLists.txt b/Tests/GeometricAdvectMask/CMakeLists.txt index 509c4d1e..ba065d6f 100644 --- a/Tests/GeometricAdvectMask/CMakeLists.txt +++ b/Tests/GeometricAdvectMask/CMakeLists.txt @@ -4,4 +4,5 @@ project(GeometricAdvectMask LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/GeometricAdvectPerformance/CMakeLists.txt b/Tests/GeometricAdvectPerformance/CMakeLists.txt index 0e32974f..2a9088d1 100644 --- a/Tests/GeometricAdvectPerformance/CMakeLists.txt +++ b/Tests/GeometricAdvectPerformance/CMakeLists.txt @@ -4,4 +4,5 @@ project(GeometricAdvectPerformance LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/GeometricAdvectTrench/CMakeLists.txt b/Tests/GeometricAdvectTrench/CMakeLists.txt index a2fbe02f..4238d9a3 100644 --- a/Tests/GeometricAdvectTrench/CMakeLists.txt +++ b/Tests/GeometricAdvectTrench/CMakeLists.txt @@ -4,4 +4,5 @@ project(GeometricAdvectTrench LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/HullMesh/CMakeLists.txt b/Tests/HullMesh/CMakeLists.txt index 9c9a725c..f6d33b74 100644 --- a/Tests/HullMesh/CMakeLists.txt +++ b/Tests/HullMesh/CMakeLists.txt @@ -4,4 +4,5 @@ project(HullMesh LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/Make3DSphere/CMakeLists.txt b/Tests/Make3DSphere/CMakeLists.txt index 00b0ecd7..2dc9b6ca 100644 --- a/Tests/Make3DSphere/CMakeLists.txt +++ b/Tests/Make3DSphere/CMakeLists.txt @@ -4,4 +4,5 @@ project(Make3DSphere LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/MakeBox/CMakeLists.txt b/Tests/MakeBox/CMakeLists.txt index 42faadfc..7efb6421 100644 --- a/Tests/MakeBox/CMakeLists.txt +++ b/Tests/MakeBox/CMakeLists.txt @@ -4,4 +4,5 @@ project(MakeBox LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/MakeGeometry/CMakeLists.txt b/Tests/MakeGeometry/CMakeLists.txt index e06e83cc..e148a65d 100644 --- a/Tests/MakeGeometry/CMakeLists.txt +++ b/Tests/MakeGeometry/CMakeLists.txt @@ -4,4 +4,5 @@ project(MakeGeometry LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/MakePlane/CMakeLists.txt b/Tests/MakePlane/CMakeLists.txt index 9b6a797d..295f5173 100644 --- a/Tests/MakePlane/CMakeLists.txt +++ b/Tests/MakePlane/CMakeLists.txt @@ -4,4 +4,5 @@ project(MakePlane LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/MakeSphere/CMakeLists.txt b/Tests/MakeSphere/CMakeLists.txt index 39859d9b..9d33a0c9 100644 --- a/Tests/MakeSphere/CMakeLists.txt +++ b/Tests/MakeSphere/CMakeLists.txt @@ -4,4 +4,5 @@ project(MakeSphere LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/MarkVoidPoints/CMakeLists.txt b/Tests/MarkVoidPoints/CMakeLists.txt index 13577455..602585a1 100644 --- a/Tests/MarkVoidPoints/CMakeLists.txt +++ b/Tests/MarkVoidPoints/CMakeLists.txt @@ -4,4 +4,5 @@ project(MarkVoidPoints LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/MultiMaterialAdvection/CMakeLists.txt b/Tests/MultiMaterialAdvection/CMakeLists.txt index a1d9cfe7..f4f9709d 100644 --- a/Tests/MultiMaterialAdvection/CMakeLists.txt +++ b/Tests/MultiMaterialAdvection/CMakeLists.txt @@ -4,4 +4,5 @@ project(MultiMaterialAdvection LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/MultiMaterialEtch/CMakeLists.txt b/Tests/MultiMaterialEtch/CMakeLists.txt index 798dde7f..b68f7630 100644 --- a/Tests/MultiMaterialEtch/CMakeLists.txt +++ b/Tests/MultiMaterialEtch/CMakeLists.txt @@ -4,4 +4,5 @@ project(MultiMaterialEtch LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/PeriodicBoundary2D/CMakeLists.txt b/Tests/PeriodicBoundary2D/CMakeLists.txt index cd7023a7..79336243 100644 --- a/Tests/PeriodicBoundary2D/CMakeLists.txt +++ b/Tests/PeriodicBoundary2D/CMakeLists.txt @@ -4,4 +4,5 @@ project(PeriodicBoundary2D LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/ReadFromFile/CMakeLists.txt b/Tests/ReadFromFile/CMakeLists.txt index d4c55b3f..7749a8e5 100644 --- a/Tests/ReadFromFile/CMakeLists.txt +++ b/Tests/ReadFromFile/CMakeLists.txt @@ -4,4 +4,5 @@ project(ReadFromFile LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/ReadVolume/CMakeLists.txt b/Tests/ReadVolume/CMakeLists.txt index 0bbadb25..dc565a0d 100644 --- a/Tests/ReadVolume/CMakeLists.txt +++ b/Tests/ReadVolume/CMakeLists.txt @@ -4,4 +4,5 @@ project(ReadVolume LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/RemoveStrayPoints/CMakeLists.txt b/Tests/RemoveStrayPoints/CMakeLists.txt index 4c8600a2..f914ba66 100644 --- a/Tests/RemoveStrayPoints/CMakeLists.txt +++ b/Tests/RemoveStrayPoints/CMakeLists.txt @@ -4,4 +4,5 @@ project(RemoveStrayPoints LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/RotateMesh/CMakeLists.txt b/Tests/RotateMesh/CMakeLists.txt index 83f2c959..9b7140c8 100644 --- a/Tests/RotateMesh/CMakeLists.txt +++ b/Tests/RotateMesh/CMakeLists.txt @@ -4,4 +4,5 @@ project(RotateMesh LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/Serialize/CMakeLists.txt b/Tests/Serialize/CMakeLists.txt index 5e5238cc..f58987fb 100644 --- a/Tests/Serialize/CMakeLists.txt +++ b/Tests/Serialize/CMakeLists.txt @@ -4,4 +4,5 @@ project(Serialize LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/SmartPointer/CMakeLists.txt b/Tests/SmartPointer/CMakeLists.txt index 39044975..b3b5fa03 100644 --- a/Tests/SmartPointer/CMakeLists.txt +++ b/Tests/SmartPointer/CMakeLists.txt @@ -4,4 +4,5 @@ project(SmartPointer LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/VisualizationMesh/CMakeLists.txt b/Tests/VisualizationMesh/CMakeLists.txt index 09915af4..69f180db 100644 --- a/Tests/VisualizationMesh/CMakeLists.txt +++ b/Tests/VisualizationMesh/CMakeLists.txt @@ -4,4 +4,5 @@ project(VisualizationMesh LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/Tests/VoidDetection/CMakeLists.txt b/Tests/VoidDetection/CMakeLists.txt index df1dcc24..c0ba3845 100644 --- a/Tests/VoidDetection/CMakeLists.txt +++ b/Tests/VoidDetection/CMakeLists.txt @@ -4,4 +4,5 @@ project(VoidDetection LANGUAGES CXX) add_executable(${PROJECT_NAME} "${PROJECT_NAME}.cpp") target_link_libraries(${PROJECT_NAME} PRIVATE ViennaLS) +add_dependencies(ViennaLS_Tests ${PROJECT_NAME}) add_test(NAME ${PROJECT_NAME} COMMAND $) diff --git a/cmake/vtk.cmake b/cmake/vtk.cmake new file mode 100644 index 00000000..ecac0715 --- /dev/null +++ b/cmake/vtk.cmake @@ -0,0 +1,9 @@ +macro(setup_vtk_env TARGET OUTPUT) + message(STATUS "[ViennaLS] Setting up VTK for ${TARGET}") + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/${OUTPUT}>) + + add_custom_command( + TARGET ${TARGET} + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory ${VTK_LIBS} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) +endmacro() From 38771b520ebc9e41e1a74e9bdec83fa11411c390 Mon Sep 17 00:00:00 2001 From: Curve Date: Sat, 2 Dec 2023 17:17:38 +0100 Subject: [PATCH 35/41] fix: formatting --- Examples/CMakeLists.txt | 2 +- Tests/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index f686658c..b49a3350 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -1,6 +1,6 @@ add_custom_target(ViennaLS_Examples ALL) -if (NOT VTK_DIR) +if(NOT VTK_DIR) include("../cmake/vtk.cmake") setup_vtk_env(ViennaLS_Examples "examples") endif() diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index 50c2d635..d8289552 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -1,6 +1,6 @@ add_custom_target(ViennaLS_Tests ALL) -if (NOT VTK_DIR) +if(NOT VTK_DIR) include("../cmake/vtk.cmake") setup_vtk_env(ViennaLS_Tests "tests") endif() From 357a02c8b9ce728a9a2dbdd4088a34c3b2ffc83d Mon Sep 17 00:00:00 2001 From: Curve Date: Sat, 2 Dec 2023 17:27:44 +0100 Subject: [PATCH 36/41] fix: remove debug print --- Python/CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/Python/CMakeLists.txt b/Python/CMakeLists.txt index ce91e2ed..7f99f1da 100644 --- a/Python/CMakeLists.txt +++ b/Python/CMakeLists.txt @@ -23,8 +23,6 @@ CPMFindPackage( # Constants # -------------------------------------------------------------------------------------------------------- -message("${CMAKE_LIBRARY_OUTPUT_DIRECTORY}") - set(VIENNALS_PYTHON_MODULE_NAME "viennals") set(VIENNALS_LIBRARY_OUTPUT_DIR ${CMAKE_BINARY_DIR}) From 2aa3da15b7fc81222c74375bcc3427009d309f5e Mon Sep 17 00:00:00 2001 From: Curve Date: Sat, 2 Dec 2023 17:30:03 +0100 Subject: [PATCH 37/41] fix(cmakelists): vtk dir on linux --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 86b1b405..10493cf9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -145,7 +145,7 @@ if(VIENNALS_USE_VTK) if(MSVC) set(VTK_LIBS "${VTK_BINARY_DIR}/bin/$") else() - set(VTK_LIBS "${VTK_BINARY_DIR}/bin") + set(VTK_LIBS "${VTK_BINARY_DIR}/lib") endif() endif() From c95fd8dc46416a86a4a306f52d44e962769be499 Mon Sep 17 00:00:00 2001 From: Curve Date: Sun, 3 Dec 2023 00:32:35 +0100 Subject: [PATCH 38/41] fix: skip vtk environment on non windows platforms --- Python/CMakeLists.txt | 4 +++- cmake/vtk.cmake | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/Python/CMakeLists.txt b/Python/CMakeLists.txt index 7f99f1da..0095acfc 100644 --- a/Python/CMakeLists.txt +++ b/Python/CMakeLists.txt @@ -37,9 +37,11 @@ endif() include("../cmake/vtk.cmake") -if(NOT VTK_DIR) +if(WIN32 AND NOT VTK_DIR) setup_vtk_env(${PROJECT_NAME} vtk_env) set(VTK_DIR "${PROJECT_BINARY_DIR}/vtk_env") +elseif(NOT VTK_DIR) + set(VTK_DIR "${VTK_LIBS}") endif() # -------------------------------------------------------------------------------------------------------- diff --git a/cmake/vtk.cmake b/cmake/vtk.cmake index ecac0715..63ca10b8 100644 --- a/cmake/vtk.cmake +++ b/cmake/vtk.cmake @@ -1,4 +1,10 @@ macro(setup_vtk_env TARGET OUTPUT) + + if (NOT WIN32) + message(STATUS "[ViennaLS] Skipping VTK-Environment setup for ${TARGET} (Only required on Windows)") + return() + endif() + message(STATUS "[ViennaLS] Setting up VTK for ${TARGET}") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/${OUTPUT}>) From a8acd4cd78171aa20baf2559d54ce2a72d8175a1 Mon Sep 17 00:00:00 2001 From: Curve Date: Sun, 3 Dec 2023 00:34:48 +0100 Subject: [PATCH 39/41] fix: formatting --- cmake/vtk.cmake | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cmake/vtk.cmake b/cmake/vtk.cmake index 63ca10b8..36a4b25e 100644 --- a/cmake/vtk.cmake +++ b/cmake/vtk.cmake @@ -1,7 +1,8 @@ macro(setup_vtk_env TARGET OUTPUT) - if (NOT WIN32) - message(STATUS "[ViennaLS] Skipping VTK-Environment setup for ${TARGET} (Only required on Windows)") + if(NOT WIN32) + message( + STATUS "[ViennaLS] Skipping VTK-Environment setup for ${TARGET} (Only required on Windows)") return() endif() From 0a440c9515c4a37ab6e0c0c433d28638919c58dd Mon Sep 17 00:00:00 2001 From: Curve Date: Sun, 3 Dec 2023 00:53:06 +0100 Subject: [PATCH 40/41] refactor: more logging, don't use early return in macro * early return behavior in macro may vary in different cmake versions --- Examples/CMakeLists.txt | 1 + Tests/CMakeLists.txt | 1 + cmake/vtk.cmake | 18 ++++++++---------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Examples/CMakeLists.txt b/Examples/CMakeLists.txt index b49a3350..acd4eea5 100644 --- a/Examples/CMakeLists.txt +++ b/Examples/CMakeLists.txt @@ -15,5 +15,6 @@ foreach(entry ${entries}) continue() endif() + message(STATUS "[ViennaLS] Adding Example ${entry}") add_subdirectory(${entry}) endforeach() diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt index d8289552..2ecf7b43 100644 --- a/Tests/CMakeLists.txt +++ b/Tests/CMakeLists.txt @@ -15,5 +15,6 @@ foreach(entry ${entries}) continue() endif() + message(STATUS "[ViennaLS] Adding Test ${entry}") add_subdirectory(${entry}) endforeach() diff --git a/cmake/vtk.cmake b/cmake/vtk.cmake index 36a4b25e..10c4360d 100644 --- a/cmake/vtk.cmake +++ b/cmake/vtk.cmake @@ -1,16 +1,14 @@ macro(setup_vtk_env TARGET OUTPUT) - if(NOT WIN32) message( STATUS "[ViennaLS] Skipping VTK-Environment setup for ${TARGET} (Only required on Windows)") - return() - endif() + else() + message(STATUS "[ViennaLS] Setting up VTK for ${TARGET}") + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/${OUTPUT}>) - message(STATUS "[ViennaLS] Setting up VTK for ${TARGET}") - set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${PROJECT_BINARY_DIR}/${OUTPUT}>) - - add_custom_command( - TARGET ${TARGET} - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy_directory ${VTK_LIBS} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + add_custom_command( + TARGET ${TARGET} + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy_directory ${VTK_LIBS} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}) + endif() endmacro() From 05eb427a21fbcf53d31ac35a3094df0ac2f5ab93 Mon Sep 17 00:00:00 2001 From: Curve Date: Sun, 3 Dec 2023 02:14:10 +0100 Subject: [PATCH 41/41] refactor: adjust target naming --- CMakeLists.txt | 10 +++++----- Python/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 10493cf9..21b55fe5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -160,12 +160,12 @@ if(VIENNALS_PRECOMPILE_HEADERS) set(VIENNALS_LINKAGE STATIC) endif() - add_library(${PROJECT_NAME}Lib ${VIENNALS_LINKAGE}) - add_library(${PROJECT_NAME}::Lib ALIAS ${PROJECT_NAME}Lib) + add_library(${PROJECT_NAME}_Lib ${VIENNALS_LINKAGE}) + add_library(${PROJECT_NAME}::Lib ALIAS ${PROJECT_NAME}_Lib) - target_link_libraries(${PROJECT_NAME}Lib PUBLIC ${PROJECT_NAME}) - target_sources(${PROJECT_NAME}Lib PUBLIC "lib/specialisations.cpp") - set_target_properties(${PROJECT_NAME}Lib PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) + target_link_libraries(${PROJECT_NAME}_Lib PUBLIC ${PROJECT_NAME}) + target_sources(${PROJECT_NAME}_Lib PUBLIC "lib/specialisations.cpp") + set_target_properties(${PROJECT_NAME}_Lib PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) endif() # -------------------------------------------------------------------------------------------------------- diff --git a/Python/CMakeLists.txt b/Python/CMakeLists.txt index 0095acfc..9dc03ec9 100644 --- a/Python/CMakeLists.txt +++ b/Python/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.14) -project(ViennaLSPython LANGUAGES CXX) +project(ViennaLS_Python LANGUAGES CXX) add_custom_target(${PROJECT_NAME} ALL)