Add a simple regression test (#7)

- Remove regression test with GridTools dependencies and add a simple one (needs to be extended)
- Cleanup some dependencies

Author: havogt

CMakeLists.txt

@@ -4,17 +4,16 @@ file(STRINGS "version.txt" __C_BINDINGS_VERSION)
 project(c_bindings VERSION ${__C_BINDINGS_VERSION} LANGUAGES CXX)
 unset(__C_BINDINGS_VERSION)
 
-list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
-
 include(CTest)
 
 set(REQUIRED_BOOST_VERSION 1.58)
 find_package(Boost ${REQUIRED_BOOST_VERSION} REQUIRED)
 
-include(bindings)
+# if used via FetchContent/add_subdirectory() we need to make the add_bindings_library() available here
+include(${CMAKE_CURRENT_LIST_DIR}/cmake/bindings.cmake)
 
 if (BUILD_TESTING)
     add_subdirectory(tests)
 endif()
 
-include(export)
+include(${CMAKE_CURRENT_LIST_DIR}/cmake/export.cmake)

cmake/bindings.cmake

@@ -2,7 +2,7 @@ function(generate_gt_bindings)
     set(__C_BINDINGS_SOURCE_DIR ${PROJECT_SOURCE_DIR}/src)
     set(__C_BINDINGS_CMAKE_DIR ${PROJECT_SOURCE_DIR}/cmake)
     set(__C_BINDINGS_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
-    configure_file(cmake/gt_bindings.cmake.in
+    configure_file(${PROJECT_SOURCE_DIR}/cmake/gt_bindings.cmake.in
         ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/bindings_for_build/gt_bindings.cmake
         @ONLY)
     unset(__C_BINDINGS_SOURCE_DIR)

include/c_bindings/export.hpp

@@ -15,7 +15,6 @@
 #include <boost/mpl/at.hpp>
 #include <boost/preprocessor.hpp>
 
-#include "../common/boost_pp_generic_macros.hpp"
 #include "function_wrapper.hpp"
 #include "generator.hpp"
 

include/c_bindings/fortran_array_view.hpp

@@ -15,7 +15,6 @@
 #include <type_traits>
 
 #include "../common/for_each.hpp"
-#include "../meta/macros.hpp"
 #include "../meta/make_indices.hpp"
 #include "../meta/type_traits.hpp"
 
@@ -78,7 +77,7 @@ namespace gridtools {
                 descriptor.rank = std::rank<Arr>::value;
                 descriptor.is_acc_present = false;
 
-                using indices = GT_META_CALL(meta::make_indices, std::rank<Arr>);
+                using indices = typename meta::make_indices<std::rank<Arr>>::type;
                 gridtools::for_each<indices>(
                     std::bind(_impl::fill_extent_f<Arr>{}, std::placeholders::_1, std::ref(descriptor)));
 

include/c_bindings/generator.hpp

@@ -24,6 +24,7 @@
 #include <boost/type_index.hpp>
 
 #include "../common/copy_into_variadic.hpp"
+#include "../common/for_each.hpp"
 #include "../common/is_there_in_sequence_if.hpp"
 
 #include "function_wrapper.hpp"

include/common/boost_pp_generic_macros.hpp

@@ -12,8 +12,6 @@
 #include <boost/mpl/copy.hpp>
 #include <boost/mpl/inserter.hpp>
 
-// #include "../defs.hpp" TODO
-
 namespace gridtools {
 
     namespace _impl {

include/common/copy_into_variadic.hpp

@@ -12,7 +12,6 @@ if(NOT googletest_POPULATED)
   add_subdirectory(${googletest_SOURCE_DIR} ${googletest_BINARY_DIR})
 endif()
 
-
 function(compile_test name src)
     add_executable(${name} ${src})
     target_include_directories(${name} PRIVATE ${PROJECT_SOURCE_DIR}/include)
@@ -25,4 +24,4 @@ endfunction()
 enable_testing()
 
 add_subdirectory(unit_tests)
-#add_subdirectory(regression)
+add_subdirectory(regression)

tests/CMakeLists.txt

@@ -1,31 +1,3 @@
-if (GT_ENABLE_BACKEND_X86)
-    if(GT_SINGLE_PRECISION)
-        set(prec float)
-    else()
-        set(prec double)
-    endif()
+enable_language(Fortran) #TODO conditionally
 
-    gt_add_bindings_library(implementation_${prec} SOURCES implementation.cpp FORTRAN_MODULE_NAME implementation)
-    target_link_libraries(implementation_${prec} PUBLIC GridToolsTestX86)
-    gt_add_bindings_library(implementation_wrapper_${prec} SOURCES implementation_wrapper.cpp FORTRAN_MODULE_NAME implementation_wrapper)
-    target_link_libraries(implementation_wrapper_${prec} PUBLIC GridToolsTestX86)
-
-    if (CMAKE_C_COMPILER_LOADED)
-        add_executable(driver driver.c)
-        target_link_libraries(driver implementation_${prec}_c)
-    endif()
-
-    if (CMAKE_Fortran_COMPILER_LOADED)
-        include(fortran_helpers)
-
-        add_executable(fdriver fdriver.f90)
-        target_link_libraries(fdriver implementation_${prec}_fortran)
-        set_target_properties(fdriver PROPERTIES LINKER_LANGUAGE Fortran)
-        gt_enable_fortran_preprocessing_on_target(fdriver)
-
-        add_executable(fdriver_wrapper fdriver_wrapper.f90)
-        target_link_libraries(fdriver_wrapper implementation_wrapper_${prec}_fortran)
-        set_target_properties(fdriver_wrapper PROPERTIES LINKER_LANGUAGE Fortran)
-        gt_enable_fortran_preprocessing_on_target(fdriver_wrapper)
-    endif()
-endif(GT_ENABLE_BACKEND_X86)
+add_subdirectory(simple)