[evolution] eds-I#281 - GLibTools.cmake: Use basename in glib-mkenums templates
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution] eds-I#281 - GLibTools.cmake: Use basename in glib-mkenums templates
- Date: Tue, 8 Dec 2020 07:49:02 +0000 (UTC)
commit 6da51f4d8e21df2246edf6b08149cea635ecef75
Author: Milan Crha <mcrha redhat com>
Date: Tue Dec 8 08:48:32 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/e-util/CMakeLists.txt | 1 +
src/em-format/CMakeLists.txt | 1 +
src/libemail-engine/CMakeLists.txt | 1 +
src/mail/CMakeLists.txt | 1 +
src/shell/CMakeLists.txt | 1 +
6 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
index d40953c4fb..d262fd872e 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/e-util/CMakeLists.txt b/src/e-util/CMakeLists.txt
index 2fe304d2d3..5c48fccd00 100644
--- a/src/e-util/CMakeLists.txt
+++ b/src/e-util/CMakeLists.txt
@@ -638,6 +638,7 @@ target_include_directories(evolution-util PUBLIC
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
${AUTOAR_INCLUDE_DIRS}
${ENCHANT_INCLUDE_DIRS}
${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
diff --git a/src/em-format/CMakeLists.txt b/src/em-format/CMakeLists.txt
index 4a88b8cf95..6e32d239de 100644
--- a/src/em-format/CMakeLists.txt
+++ b/src/em-format/CMakeLists.txt
@@ -127,6 +127,7 @@ target_include_directories(evolution-mail-formatter PUBLIC
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src/smime/lib
${CMAKE_SOURCE_DIR}/src/smime/gui
+ ${CMAKE_CURRENT_SOURCE_DIR}
${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
${GNOME_PLATFORM_INCLUDE_DIRS}
)
diff --git a/src/libemail-engine/CMakeLists.txt b/src/libemail-engine/CMakeLists.txt
index 9029cc7317..65c0488f62 100644
--- a/src/libemail-engine/CMakeLists.txt
+++ b/src/libemail-engine/CMakeLists.txt
@@ -72,6 +72,7 @@ target_include_directories(email-engine PUBLIC
${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
${GNOME_PLATFORM_INCLUDE_DIRS}
)
diff --git a/src/mail/CMakeLists.txt b/src/mail/CMakeLists.txt
index 7c77827b12..5d08d13928 100644
--- a/src/mail/CMakeLists.txt
+++ b/src/mail/CMakeLists.txt
@@ -250,6 +250,7 @@ target_include_directories(evolution-mail PUBLIC
${CMAKE_SOURCE_DIR}/src/shell
${CMAKE_SOURCE_DIR}/src/smime/lib
${CMAKE_SOURCE_DIR}/src/smime/gui
+ ${CMAKE_CURRENT_SOURCE_DIR}
${CERT_UI_INCLUDES}
${CANBERRA_INCLUDE_DIRS}
${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
diff --git a/src/shell/CMakeLists.txt b/src/shell/CMakeLists.txt
index 86d4437bcb..0fbf96e5b1 100644
--- a/src/shell/CMakeLists.txt
+++ b/src/shell/CMakeLists.txt
@@ -81,6 +81,7 @@ target_include_directories(evolution-shell PUBLIC
${CMAKE_BINARY_DIR}/src
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
${CLUTTER_GTK_INCLUDE_DIRS}
${EVOLUTION_DATA_SERVER_INCLUDE_DIRS}
${GNOME_PLATFORM_INCLUDE_DIRS}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]