Rename all gen to bindgen (#25)

and remove remaining mentions of `c_bindings`.

Author: havogt

README.md

@@ -13,14 +13,14 @@ You can easily integrate **cpp_bindgen** in your CMake project with the followin
 ```cmake
 include(FetchContent)
 FetchContent_Declare(
-  c_bindings
-  GIT_REPOSITORY https://github.com/GridTools/c_bindings.git
+  cpp_bindgen
+  GIT_REPOSITORY https://github.com/GridTools/cpp_bindgen.git
   GIT_TAG        master # consider replacing master by a tagged version
 )
-FetchContent_GetProperties(c_bindings)
-if(NOT c_bindings_POPULATED)
-  FetchContent_Populate(c_bindings)
-  add_subdirectory(${c_bindings_SOURCE_DIR} ${c_bindings_BINARY_DIR})
+FetchContent_GetProperties(cpp_bindgen)
+if(NOT cpp_bindgen_POPULATED)
+  FetchContent_Populate(cpp_bindgen)
+  add_subdirectory(${cpp_bindgen_SOURCE_DIR} ${cpp_bindgen_BINARY_DIR})
 endif()
 ```
 

cmake/bindings.cmake

@@ -1,7 +1,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)
+    set(__CPP_BINDGEN_SOURCE_DIR ${PROJECT_SOURCE_DIR}/src)
+    set(__CPP_BINDGEN_CMAKE_DIR ${PROJECT_SOURCE_DIR}/cmake)
+    set(__CPP_BINDGEN_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
     configure_file(${PROJECT_SOURCE_DIR}/cmake/cpp_bindgen.cmake.in
         ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/bindings_for_build/cpp_bindgen.cmake
         @ONLY)

cmake/cpp_bindgen-config.cmake.in

@@ -7,8 +7,8 @@ message(STATUS "GridTools cpp_bindgen version @PROJECT_VERSION@ found at ${cpp_b
 include(CMakeFindDependencyMacro)
 find_dependency(Boost @REQUIRED_BOOST_VERSION@)
 
-set_and_check(cpp_bindgen_MODULE_PATH @PACKAGE_cpp_bindgen_MODULE_PATH@)
-set_and_check(cpp_bindgen_SOURCES_PATH @PACKAGE_cpp_bindgen_SOURCES_PATH@)
-set_and_check(cpp_bindgen_INCLUDE_PATH @PACKAGE_cpp_bindgen_INCLUDE_PATH@)
+set_and_check(cpp_bindgen_CMAKE_DIR @PACKAGE_cpp_bindgen_CMAKE_DIR@)
+set_and_check(cpp_bindgen_SOURCE_DIR @PACKAGE_cpp_bindgen_SOURCE_DIR@)
+set_and_check(cpp_bindgen_INCLUDE_DIR @PACKAGE_cpp_bindgen_INCLUDE_DIR@)
 
-include(${cpp_bindgen_MODULE_PATH}/cpp_bindgen.cmake)
+include(${cpp_bindgen_CMAKE_DIR}/cpp_bindgen.cmake)

cmake/cpp_bindgen.cmake.in

@@ -31,27 +31,27 @@ include_guard()
 option(GT_ENABLE_BINDINGS_GENERATION "If turned off, bindings will not be generated." ON)
 
 # variables are unset after use for scoping, they need to be redefined in the macros
-set(__C_BINDINGS_SOURCE_DIR @__C_BINDINGS_SOURCE_DIR@)
-set(__C_BINDINGS_INCLUDE_DIR @__C_BINDINGS_INCLUDE_DIR@)
+set(__CPP_BINDGEN_SOURCE_DIR @__CPP_BINDGEN_SOURCE_DIR@)
+set(__CPP_BINDGEN_INCLUDE_DIR @__CPP_BINDGEN_INCLUDE_DIR@)
 
 add_library(cpp_bindgen_interface INTERFACE)
-target_include_directories(cpp_bindgen_interface INTERFACE ${__C_BINDINGS_INCLUDE_DIR})
+target_include_directories(cpp_bindgen_interface INTERFACE ${__CPP_BINDGEN_INCLUDE_DIR})
 target_compile_features(cpp_bindgen_interface INTERFACE cxx_std_11)
 target_compile_definitions(cpp_bindgen_interface INTERFACE BOOST_PP_VARIADICS=1)
 if(CPP_BINDGEN_GT_LEGACY)
     target_compile_definitions(cpp_bindgen_interface INTERFACE CPP_BINDGEN_GT_LEGACY)
 endif()
 
-add_library(cpp_bindgen_generator ${__C_BINDINGS_SOURCE_DIR}/cpp_bindgen/generator.cpp)
+add_library(cpp_bindgen_generator ${__CPP_BINDGEN_SOURCE_DIR}/cpp_bindgen/generator.cpp)
 # PUBLIC to make export.hpp available in the sources passed to add_bindings_library()
 target_link_libraries(cpp_bindgen_generator PUBLIC Boost::boost)
 target_link_libraries(cpp_bindgen_generator PUBLIC cpp_bindgen_interface)
 
-add_library(c_bindings_handle ${__C_BINDINGS_SOURCE_DIR}/cpp_bindgen/handle.cpp)
-target_link_libraries(c_bindings_handle PUBLIC cpp_bindgen_interface)
+add_library(cpp_bindgen_handle ${__CPP_BINDGEN_SOURCE_DIR}/cpp_bindgen/handle.cpp)
+target_link_libraries(cpp_bindgen_handle PUBLIC cpp_bindgen_interface)
 
-unset(__C_BINDINGS_SOURCE_DIR)
-unset(__C_BINDINGS_INCLUDE_DIR)
+unset(__CPP_BINDGEN_SOURCE_DIR)
+unset(__CPP_BINDGEN_INCLUDE_DIR)
 
 # cpp_bindgen_enable_fortran_library()
 #
@@ -61,15 +61,15 @@ unset(__C_BINDINGS_INCLUDE_DIR)
 # However if the user wants to use the target at a later stage, e.g. in testing (with Fortran enabled), the target can
 # be created by a call to cpp_bindgen_enable_fortran_library().
 function(cpp_bindgen_enable_fortran_library target_name)
-    set(__C_BINDINGS_SOURCE_DIR @__C_BINDINGS_SOURCE_DIR@)
-    set(__C_BINDINGS_CMAKE_DIR @__C_BINDINGS_CMAKE_DIR@)
+    set(__CPP_BINDGEN_SOURCE_DIR @__CPP_BINDGEN_SOURCE_DIR@)
+    set(__CPP_BINDGEN_CMAKE_DIR @__CPP_BINDGEN_CMAKE_DIR@)
 
     if(CMAKE_Fortran_COMPILER_LOADED)
         if(NOT TARGET fortran_bindings_handle)
-            add_library(fortran_bindings_handle ${__C_BINDINGS_SOURCE_DIR}/cpp_bindgen/array_descriptor.f90 ${__C_BINDINGS_SOURCE_DIR}/cpp_bindgen/handle.f90)
-            target_link_libraries(fortran_bindings_handle PUBLIC c_bindings_handle)
+            add_library(fortran_bindings_handle ${__CPP_BINDGEN_SOURCE_DIR}/cpp_bindgen/array_descriptor.f90 ${__CPP_BINDGEN_SOURCE_DIR}/cpp_bindgen/handle.f90)
+            target_link_libraries(fortran_bindings_handle PUBLIC cpp_bindgen_handle)
             target_include_directories(fortran_bindings_handle PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
-            include(${__C_BINDINGS_CMAKE_DIR}/fortran_helpers.cmake)
+            include(${__CPP_BINDGEN_CMAKE_DIR}/fortran_helpers.cmake)
             cpp_bindgen_enable_fortran_preprocessing_on_target(fortran_bindings_handle)
         endif()
         if(NOT TARGET ${target_name}_fortran)
@@ -90,8 +90,8 @@ function(cpp_bindgen_add_library target_name)
     set(multi_value_args SOURCES)
     cmake_parse_arguments(ARG "${options}" "${one_value_args};" "${multi_value_args}" ${ARGN})
 
-    set(__C_BINDINGS_SOURCE_DIR @__C_BINDINGS_SOURCE_DIR@)
-    set(__C_BINDINGS_CMAKE_DIR @__C_BINDINGS_CMAKE_DIR@)
+    set(__CPP_BINDGEN_SOURCE_DIR @__CPP_BINDGEN_SOURCE_DIR@)
+    set(__CPP_BINDGEN_CMAKE_DIR @__CPP_BINDGEN_CMAKE_DIR@)
 
     if(NOT DEFINED ARG_FORTRAN_MODULE_NAME)
         set(ARG_FORTRAN_MODULE_NAME ${target_name}) # default value
@@ -114,7 +114,7 @@ function(cpp_bindgen_add_library target_name)
     if(GT_ENABLE_BINDINGS_GENERATION)
         # generator
         add_executable(${target_name}_decl_generator
-            ${__C_BINDINGS_SOURCE_DIR}/cpp_bindgen/generator_main.cpp)
+            ${__CPP_BINDGEN_SOURCE_DIR}/cpp_bindgen/generator_main.cpp)
         set_target_properties(${target_name}_decl_generator PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/decl_generator")
         target_link_libraries(${target_name}_decl_generator cpp_bindgen_generator)
 
@@ -134,7 +134,7 @@ function(cpp_bindgen_add_library target_name)
                 -DBINDINGS_C_DECL_FILENAME=${bindings_c_decl_filename}
                 -DBINDINGS_FORTRAN_DECL_FILENAME=${bindings_fortran_decl_filename}
                 -DFORTRAN_MODULE_NAME=${ARG_FORTRAN_MODULE_NAME}
-                -P ${__C_BINDINGS_CMAKE_DIR}/cpp_bindgen_generate.cmake
+                -P ${__CPP_BINDGEN_CMAKE_DIR}/cpp_bindgen_generate.cmake
             BYPRODUCTS ${bindings_c_decl_filename} ${bindings_fortran_decl_filename}
             DEPENDS $<TARGET_FILE:${target_name}_decl_generator>)
     else()
@@ -151,7 +151,7 @@ function(cpp_bindgen_add_library target_name)
     # bindings c library
     add_library(${target_name}_c INTERFACE)
     target_link_libraries(${target_name}_c INTERFACE ${target_name})
-    target_link_libraries(${target_name}_c INTERFACE c_bindings_handle)
+    target_link_libraries(${target_name}_c INTERFACE cpp_bindgen_handle)
     target_link_libraries(${target_name}_c INTERFACE cpp_bindgen_interface)
 
     add_dependencies(${target_name}_c ${target_name}_declarations)

cmake/export.cmake

@@ -4,13 +4,13 @@ export(PACKAGE cpp_bindgen)
 include(CMakePackageConfigHelpers)
 
 # for build tree
-set(cpp_bindgen_MODULE_PATH ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build-install/lib/cmake)
-set(cpp_bindgen_SOURCES_PATH ${PROJECT_SOURCE_DIR}/src)
-set(cpp_bindgen_INCLUDE_PATH ${PROJECT_SOURCE_DIR}/include)
+set(cpp_bindgen_CMAKE_DIR ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build-install/lib/cmake)
+set(cpp_bindgen_SOURCE_DIR ${PROJECT_SOURCE_DIR}/src)
+set(cpp_bindgen_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/include)
 configure_package_config_file(
     cmake/cpp_bindgen-config.cmake.in
     ${PROJECT_BINARY_DIR}/cpp_bindgen-config.cmake
-    PATH_VARS cpp_bindgen_MODULE_PATH cpp_bindgen_SOURCES_PATH cpp_bindgen_INCLUDE_PATH
+    PATH_VARS cpp_bindgen_CMAKE_DIR cpp_bindgen_SOURCE_DIR cpp_bindgen_INCLUDE_DIR
     INSTALL_DESTINATION ${PROJECT_BINARY_DIR}
     )
 write_basic_package_version_file(
@@ -20,13 +20,13 @@ write_basic_package_version_file(
     )
 
 # for install tree
-set(cpp_bindgen_MODULE_PATH lib/cmake)
-set(cpp_bindgen_SOURCES_PATH src)
-set(cpp_bindgen_INCLUDE_PATH include)
+set(cpp_bindgen_CMAKE_DIR lib/cmake)
+set(cpp_bindgen_SOURCE_DIR src)
+set(cpp_bindgen_INCLUDE_DIR include)
 configure_package_config_file(
     cmake/cpp_bindgen-config.cmake.in
     ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/install/cpp_bindgen-config.cmake
-    PATH_VARS cpp_bindgen_MODULE_PATH cpp_bindgen_SOURCES_PATH cpp_bindgen_INCLUDE_PATH
+    PATH_VARS cpp_bindgen_CMAKE_DIR cpp_bindgen_SOURCE_DIR cpp_bindgen_INCLUDE_DIR
     INSTALL_DESTINATION lib/cmake
     )
 write_basic_package_version_file(
@@ -42,15 +42,15 @@ install(
     DESTINATION lib/cmake
     )
 
-set(__C_BINDINGS_CMAKE_DIR "\${cpp_bindgen_MODULE_PATH}")  #TODO refactor the variable names cpp_bindgen_MODULE_PATH, etc.
-set(__C_BINDINGS_SOURCE_DIR "\${cpp_bindgen_SOURCES_PATH}")
-set(__C_BINDINGS_INCLUDE_DIR "\${cpp_bindgen_INCLUDE_PATH}")
+set(__CPP_BINDGEN_CMAKE_DIR "\${cpp_bindgen_CMAKE_DIR}")
+set(__CPP_BINDGEN_SOURCE_DIR "\${cpp_bindgen_SOURCE_DIR}")
+set(__CPP_BINDGEN_INCLUDE_DIR "\${cpp_bindgen_INCLUDE_DIR}")
 configure_file(cmake/cpp_bindgen.cmake.in
     ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build-install/lib/cmake/cpp_bindgen.cmake
     @ONLY)
-unset(__C_BINDINGS_CMAKE_DIR)
-unset(__C_BINDINGS_SOURCE_DIR)
-unset(__C_BINDINGS_INCLUDE_DIR)
+unset(__CPP_BINDGEN_CMAKE_DIR)
+unset(__CPP_BINDGEN_SOURCE_DIR)
+unset(__CPP_BINDGEN_INCLUDE_DIR)
 
 set(CMAKE_SOURCES
     "${PROJECT_SOURCE_DIR}/cmake/cpp_bindgen_generate.cmake"

example/simple/CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.12.4)
 project(simple_example LANGUAGES CXX C Fortran)
 
-# 1) find installed c_bindings version
+# 1) find installed cpp_bindgen version
 find_package(cpp_bindgen)
 
 # 2) create a library with bindings

example/simple/driver.f90

@@ -8,7 +8,7 @@
 
 program main
     use iso_c_binding
-    use gen_handle
+    use bindgen_handle
     use simple
     implicit none
     integer, parameter :: i = 9

example/simple/simple.cpp

@@ -11,10 +11,10 @@
 #include <cpp_bindgen/export.hpp>
 #include <iostream>
 
-// In this example, we demonstrate how the c_bindings library can be used to export functions to C and Fortran.
+// In this example, we demonstrate how the cpp_bindgen library can be used to export functions to C and Fortran.
 
 namespace {
     void print_number(int i) { std::cout << "Printing from C++: " << i << std::endl; }
 
-    GEN_EXPORT_BINDING_1(print_number_from_cpp, print_number);
+    BINDGEN_EXPORT_BINDING_1(print_number_from_cpp, print_number);
 } // namespace

example/simple_fetch_content/CMakeLists.txt

@@ -13,7 +13,7 @@ FetchContent_Declare(
 )
 # FetchContent_MakeAvailable(cpp_bindgen) for CMake >= 3.14, otherwise:
 FetchContent_GetProperties(cpp_bindgen)
-if(NOT c_bindings_POPULATED)
+if(NOT cpp_bindgen_POPULATED)
   FetchContent_Populate(cpp_bindgen)
   add_subdirectory(${cpp_bindgen_SOURCE_DIR} ${cpp_bindgen_BINARY_DIR})
 endif()

example/simple_fetch_content/driver.f90

@@ -8,7 +8,7 @@
 
 program main
     use iso_c_binding
-    use gen_handle
+    use bindgen_handle
     use simple
     implicit none
     integer, parameter :: i = 9