First round of renamings: cpp_bindgen with GEN_ or gen_ prefix (#9)

Author: havogt

CMakeLists.txt

@@ -1,8 +1,8 @@
 cmake_minimum_required(VERSION 3.12.4)
 
-file(STRINGS "version.txt" __C_BINDINGS_VERSION)
-project(c_bindings VERSION ${__C_BINDINGS_VERSION} LANGUAGES CXX)
-unset(__C_BINDINGS_VERSION)
+file(STRINGS "version.txt" __CPP_BINDGEN_VERSION)
+project(cpp_bindgen VERSION ${__CPP_BINDGEN_VERSION} LANGUAGES CXX)
+unset(__CPP_BINDGEN_VERSION)
 
 include(CTest)
 

cmake/bindings.cmake

@@ -2,14 +2,10 @@ 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(${PROJECT_SOURCE_DIR}/cmake/gt_bindings.cmake.in
-        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/bindings_for_build/gt_bindings.cmake
+    configure_file(${PROJECT_SOURCE_DIR}/cmake/cpp_bindgen.cmake.in
+        ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/bindings_for_build/cpp_bindgen.cmake
         @ONLY)
-    unset(__C_BINDINGS_SOURCE_DIR)
-    unset(__C_BINDINGS_CMAKE_DIR)
-    unset(__C_BINDINGS_INCLUDE_DIR)
 endfunction()
 
 generate_gt_bindings()
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/bindings_for_build")
-include(gt_bindings)
+include(${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/bindings_for_build/cpp_bindgen.cmake)

cmake/cpp_bindgen-config.cmake.in

@@ -0,0 +1,14 @@
+@PACKAGE_INIT@
+
+get_filename_component(cpp_bindgen_CONFIG_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH)
+
+message(STATUS "GridTools cpp_bindgen version @PROJECT_VERSION@ found at ${cpp_bindgen_CONFIG_CMAKE_DIR}")
+
+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@)
+
+include(${cpp_bindgen_MODULE_PATH}/cpp_bindgen.cmake)

cmake/gt_bindings.cmake.in cmake/cpp_bindgen.cmake.incmake/gt_bindings.cmake.in renamed to cmake/cpp_bindgen.cmake.in

@@ -2,7 +2,7 @@
 #
 # Usage of this module:
 #
-#  gt_add_bindings_library(<library-name> SOURCES <sources>[...] [FORTRAN_OUTPUT_DIR fortran_dir] [C_OUTPUT_DIR c_dir] [FORTRAN_MODULE_NAME name])
+#  cpp_bindgen_add_library(<library-name> SOURCES <sources>[...] [FORTRAN_OUTPUT_DIR fortran_dir] [C_OUTPUT_DIR c_dir] [FORTRAN_MODULE_NAME name])
 #
 #  Arguments:
 #   SOURCES: sources of the library
@@ -18,9 +18,9 @@
 #  If GT_ENABLE_BINDINGS_GENERATION is not defined already it will be made available after including this file.
 #
 # In the default case (GT_ENABLE_BINDINGS_GENERATION=ON), the bindings files are generated in the directory
-# where the CMakeLists.txt with the call to gt_add_bindings_library() is located.
+# where the CMakeLists.txt with the call to cpp_bindgen_add_library() is located.
 #
-# Targets generated by gt_add_bindings_library(<library-name> ...):
+# Targets generated by cpp_bindgen_add_library(<library-name> ...):
 #  - <library_name> library build from <Sources...> without bindings (ususally this target is not used)
 #  - <library_name>_declarations will run the generator for this library
 #  - <library_name>_c the C-bindings with <library_name> linked to it
@@ -32,33 +32,33 @@ option(GT_ENABLE_BINDINGS_GENERATION "If turned off, bindings will not be genera
 set(__C_BINDINGS_SOURCE_DIR @__C_BINDINGS_SOURCE_DIR@)
 set(__C_BINDINGS_INCLUDE_DIR @__C_BINDINGS_INCLUDE_DIR@)
 
-add_library(c_bindings_generator ${__C_BINDINGS_SOURCE_DIR}/c_bindings/generator.cpp)
+add_library(cpp_bindgen_generator ${__C_BINDINGS_SOURCE_DIR}/cpp_bindgen/generator.cpp)
 # PUBLIC to make export.hpp available in the sources passed to add_bindings_library()
-target_include_directories(c_bindings_generator PUBLIC ${__C_BINDINGS_INCLUDE_DIR})
-target_compile_features(c_bindings_generator PUBLIC cxx_std_11)
-target_link_libraries(c_bindings_generator PUBLIC Boost::boost)
+target_include_directories(cpp_bindgen_generator PUBLIC ${__C_BINDINGS_INCLUDE_DIR})
+target_compile_features(cpp_bindgen_generator PUBLIC cxx_std_11)
+target_link_libraries(cpp_bindgen_generator PUBLIC Boost::boost)
 
-add_library(c_bindings_handle ${__C_BINDINGS_SOURCE_DIR}/c_bindings/handle.cpp)
+add_library(c_bindings_handle ${__C_BINDINGS_SOURCE_DIR}/cpp_bindgen/handle.cpp)
 target_include_directories(c_bindings_handle PRIVATE ${__C_BINDINGS_INCLUDE_DIR})
 target_compile_features(c_bindings_handle PRIVATE cxx_std_11)
-target_link_libraries(c_bindings_generator PRIVATE Boost::boost) #TODO make an interface target for options
+target_link_libraries(cpp_bindgen_generator PRIVATE Boost::boost) #TODO make an interface target for options
 
 unset(__C_BINDINGS_SOURCE_DIR)
 unset(__C_BINDINGS_INCLUDE_DIR)
 
-# gt_enable_bindings_library_fortran()
+# cpp_bindgen_enable_fortran_library()
 #
 # Create a target to compile the generated Fortran module.
-# In the default case, when Fortran is enabled on the call to gt_add_bindings_library(), this target is automatically created.
+# In the default case, when Fortran is enabled on the call to cpp_bindgen_add_library(), this target is automatically created.
 # In case when the Fortran language was not enabled, we cannot create a library (add_library()) with Fortran files.
 # 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 gt_enable_bindings_library_fortran().
-function(gt_enable_bindings_library_fortran target_name)
+# 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@)
 
     if(CMAKE_Fortran_COMPILER_LOADED)
         if(NOT TARGET fortran_bindings_handle)
-            add_library(fortran_bindings_handle ${__C_BINDINGS_SOURCE_DIR}/c_bindings/array_descriptor.f90 ${__C_BINDINGS_SOURCE_DIR}/c_bindings/handle.f90)
+            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)
             target_include_directories(fortran_bindings_handle PUBLIC ${CMAKE_CURRENT_BINARY_DIR})
         endif()
@@ -75,7 +75,7 @@ function(gt_enable_bindings_library_fortran target_name)
     endif()
 endfunction()
 
-function(gt_add_bindings_library target_name)
+function(cpp_bindgen_add_library target_name)
     set(options)
     set(one_value_args FORTRAN_OUTPUT_DIR C_OUTPUT_DIR FORTRAN_MODULE_NAME)
     set(multi_value_args SOURCES)
@@ -100,15 +100,15 @@ function(gt_add_bindings_library target_name)
     endif()
 
     add_library(${target_name} ${ARG_SOURCES})
-    target_link_libraries(${target_name} PRIVATE c_bindings_generator)
+    target_link_libraries(${target_name} PRIVATE cpp_bindgen_generator)
     # target_include_directories(${target_name} PRIVATE ${PROJECT_SOURCE_DIR}/include) #TODO probably wrong
 
     if(GT_ENABLE_BINDINGS_GENERATION)
         # generator
         add_executable(${target_name}_decl_generator
-            ${__C_BINDINGS_SOURCE_DIR}/c_bindings/generator_main.cpp)
+            ${__C_BINDINGS_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 c_bindings_generator)
+        target_link_libraries(${target_name}_decl_generator cpp_bindgen_generator)
 
         if (${APPLE})
             target_link_libraries(${target_name}_decl_generator
@@ -126,7 +126,7 @@ function(gt_add_bindings_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}/gt_bindings_generate.cmake
+                -P ${__C_BINDINGS_CMAKE_DIR}/cpp_bindgen_generate.cmake
             BYPRODUCTS ${bindings_c_decl_filename} ${bindings_fortran_decl_filename}
             DEPENDS $<TARGET_FILE:${target_name}_decl_generator>)
     else()
@@ -148,8 +148,8 @@ function(gt_add_bindings_library target_name)
 
     # bindings Fortran library
     # Export the name of the generated file. The variable needs to exist in the whole cmake!
-    # Reason: see description of gt_enable_bindings_library_fortran().
+    # Reason: see description of cpp_bindgen_enable_fortran_library().
     set(GT_${target_name}_fortran_bindings_path ${bindings_fortran_decl_filename}
         CACHE INTERNAL "Path to the generated Fortran file for ${target_name}")
-    gt_enable_bindings_library_fortran(${target_name} TRUE)
+    cpp_bindgen_enable_fortran_library(${target_name} TRUE)
 endfunction()

cmake/gt_bindings_generate.cmake cmake/cpp_bindgen_generate.cmakecmake/gt_bindings_generate.cmake renamed to cmake/cpp_bindgen_generate.cmake

@@ -12,50 +12,50 @@
 
 include(CMakePackageConfigHelpers)
 
-write_basic_package_version_file(gt_c_bindings-config-version.cmake
+write_basic_package_version_file(cpp_bindgen-config-version.cmake
     VERSION ${PROJECT_VERSION}
     COMPATIBILITY SameMajorVersion
     )
 
-set(gt_c_bindings_MODULE_PATH lib/cmake)
-set(gt_c_bindings_SOURCES_PATH src)
-set(gt_c_bindings_INCLUDE_PATH include)
+set(cpp_bindgen_MODULE_PATH lib/cmake)
+set(cpp_bindgen_SOURCES_PATH src)
+set(cpp_bindgen_INCLUDE_PATH include)
 
-configure_package_config_file(cmake/gt_c_bindings-config.cmake.in
-${CMAKE_CURRENT_BINARY_DIR}/gt_c_bindings-config.cmake
-PATH_VARS gt_c_bindings_MODULE_PATH gt_c_bindings_SOURCES_PATH gt_c_bindings_INCLUDE_PATH
+configure_package_config_file(cmake/cpp_bindgen-config.cmake.in
+${CMAKE_CURRENT_BINARY_DIR}/cpp_bindgen-config.cmake
+PATH_VARS cpp_bindgen_MODULE_PATH cpp_bindgen_SOURCES_PATH cpp_bindgen_INCLUDE_PATH
 INSTALL_DESTINATION lib/cmake
 )
 
 install(
     FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/gt_c_bindings-config.cmake
-    ${CMAKE_CURRENT_BINARY_DIR}/gt_c_bindings-config-version.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/cpp_bindgen-config.cmake
+    ${CMAKE_CURRENT_BINARY_DIR}/cpp_bindgen-config-version.cmake
     DESTINATION lib/cmake
     )
 
-set(__C_BINDINGS_CMAKE_DIR "\${gt_c_bindings_MODULE_PATH}")  #TODO refactor the variable names gt_c_bindings_MODULE_PATH, etc.
-set(__C_BINDINGS_SOURCE_DIR "\${gt_c_bindings_SOURCES_PATH}")
-set(__C_BINDINGS_INCLUDE_DIR "\${gt_c_bindings_INCLUDE_PATH}")
-configure_file(cmake/gt_bindings.cmake.in
-    ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build-install/lib/cmake/gt_bindings.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}")
+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)
 
 set(CMAKE_SOURCES
-    "${PROJECT_SOURCE_DIR}/cmake/gt_bindings_generate.cmake"
-    "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build-install/lib/cmake/gt_bindings.cmake"
+    "${PROJECT_SOURCE_DIR}/cmake/cpp_bindgen_generate.cmake"
+    "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/build-install/lib/cmake/cpp_bindgen.cmake"
     )
 set(CBINDINGS_SOURCES
-    "${PROJECT_SOURCE_DIR}/src/c_bindings/generator.cpp"
-    "${PROJECT_SOURCE_DIR}/src/c_bindings/generator_main.cpp"
-    "${PROJECT_SOURCE_DIR}/src/c_bindings/array_descriptor.f90"
-    "${PROJECT_SOURCE_DIR}/src/c_bindings/handle.f90"
-    "${PROJECT_SOURCE_DIR}/src/c_bindings/handle.cpp"
+    "${PROJECT_SOURCE_DIR}/src/cpp_bindgen/generator.cpp"
+    "${PROJECT_SOURCE_DIR}/src/cpp_bindgen/generator_main.cpp"
+    "${PROJECT_SOURCE_DIR}/src/cpp_bindgen/array_descriptor.f90"
+    "${PROJECT_SOURCE_DIR}/src/cpp_bindgen/handle.f90"
+    "${PROJECT_SOURCE_DIR}/src/cpp_bindgen/handle.cpp"
     )
 
 install(DIRECTORY include/ DESTINATION include)
 install(FILES ${CMAKE_SOURCES} DESTINATION "lib/cmake")
-install(FILES ${CBINDINGS_SOURCES} DESTINATION "src/c_bindings")
+install(FILES ${CBINDINGS_SOURCES} DESTINATION "src/cpp_bindgen")