[evolution-ews] eds-I#281 - GLibTools.cmake: Use basename in glib-mkenums templates



commit 60ee0bb8726057bc50aab2bd2c23031baa1ba3f0
Author: Milan Crha <mcrha redhat com>
Date:   Tue Dec 8 08:49:20 2020 +0100

    eds-I#281 - GLibTools.cmake: Use basename in glib-mkenums templates
    
    This change helps to create reproducible builds.
    
    Related to https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/281

 cmake/modules/GLibTools.cmake          | 6 +++---
 src/EWS/camel/CMakeLists.txt           | 1 +
 src/EWS/common/CMakeLists.txt          | 1 +
 src/Microsoft365/common/CMakeLists.txt | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
index d40953c4..d262fd87 100644
--- a/cmake/modules/GLibTools.cmake
+++ b/cmake/modules/GLibTools.cmake
@@ -65,7 +65,7 @@ function(glib_mkenums _output_filename_noext _enums_header _define_name)
 
 G_BEGIN_DECLS
 
-/* Enumerations from \"@filename@\" */
+/* Enumerations from \"@basename@\" */
 
 /*** END file-production ***/
 
@@ -95,8 +95,8 @@ set(SOURCE_TMPL "
 /*** END file-header ***/
 
 /*** BEGIN file-production ***/
-/* enumerations from \"@filename@\" */
-#include \"@filename@\"
+/* enumerations from \"@basename@\" */
+#include \"@basename@\"
 
 /*** END file-production ***/
 
diff --git a/src/EWS/camel/CMakeLists.txt b/src/EWS/camel/CMakeLists.txt
index bf80fd4b..e734a3b5 100644
--- a/src/EWS/camel/CMakeLists.txt
+++ b/src/EWS/camel/CMakeLists.txt
@@ -63,6 +63,7 @@ target_include_directories(camelews-priv PUBLIC
        ${CMAKE_BINARY_DIR}/src/EWS
        ${CMAKE_SOURCE_DIR}/src/EWS
        ${CMAKE_CURRENT_BINARY_DIR}
+       ${CMAKE_CURRENT_SOURCE_DIR}
        ${CAMEL_INCLUDE_DIRS}
        ${EVOLUTION_SHELL_INCLUDE_DIRS}
        ${EVOLUTION_MAIL_INCLUDE_DIRS}
diff --git a/src/EWS/common/CMakeLists.txt b/src/EWS/common/CMakeLists.txt
index 036d8e5a..40ba90f8 100644
--- a/src/EWS/common/CMakeLists.txt
+++ b/src/EWS/common/CMakeLists.txt
@@ -68,6 +68,7 @@ target_include_directories(evolution-ews PUBLIC
        ${CMAKE_BINARY_DIR}/src/EWS
        ${CMAKE_SOURCE_DIR}/src/EWS
        ${CMAKE_CURRENT_BINARY_DIR}
+       ${CMAKE_CURRENT_SOURCE_DIR}
        ${CAMEL_INCLUDE_DIRS}
        ${EVOLUTION_CALENDAR_INCLUDE_DIRS}
        ${LIBEBACKEND_INCLUDE_DIRS}
diff --git a/src/Microsoft365/common/CMakeLists.txt b/src/Microsoft365/common/CMakeLists.txt
index 671ae495..1b81e6ea 100644
--- a/src/Microsoft365/common/CMakeLists.txt
+++ b/src/Microsoft365/common/CMakeLists.txt
@@ -46,6 +46,7 @@ target_include_directories(evolution-microsoft365 PUBLIC
        ${CMAKE_BINARY_DIR}/src/Microsoft365
        ${CMAKE_SOURCE_DIR}/src/Microsoft365
        ${CMAKE_CURRENT_BINARY_DIR}
+       ${CMAKE_CURRENT_SOURCE_DIR}
        ${CAMEL_INCLUDE_DIRS}
        ${EVOLUTION_CALENDAR_INCLUDE_DIRS}
        ${JSON_GLIB_INCLUDE_DIRS}


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]