[evolution-data-server] 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-data-server] I#281 - GLibTools.cmake: Use basename in glib-mkenums templates
- Date: Tue, 8 Dec 2020 07:48:19 +0000 (UTC)
commit 832dcd19b5c0fa51e5a822ffc61e27119dc6b311
Author: Milan Crha <mcrha redhat com>
Date: Tue Dec 8 08:46:50 2020 +0100
I#281 - GLibTools.cmake: Use basename in glib-mkenums templates
This change helps to create reproducible builds.
Closes https://gitlab.gnome.org/GNOME/evolution-data-server/-/issues/281
cmake/modules/GLibTools.cmake | 6 +++---
src/addressbook/libebook-contacts/CMakeLists.txt | 1 +
src/addressbook/libebook/CMakeLists.txt | 1 +
src/calendar/libecal/CMakeLists.txt | 1 +
src/libebackend/CMakeLists.txt | 1 +
src/libedataserver/CMakeLists.txt | 1 +
6 files changed, 8 insertions(+), 3 deletions(-)
---
diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
index d40953c4f..d262fd872 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/addressbook/libebook-contacts/CMakeLists.txt
b/src/addressbook/libebook-contacts/CMakeLists.txt
index 02ca9d530..c4fdd87cd 100644
--- a/src/addressbook/libebook-contacts/CMakeLists.txt
+++ b/src/addressbook/libebook-contacts/CMakeLists.txt
@@ -134,6 +134,7 @@ target_include_directories(ebook-contacts PUBLIC
${CMAKE_SOURCE_DIR}/src/private
${CMAKE_SOURCE_DIR}/src/addressbook
${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
${ADDRESSBOOK_INCLUDE_DIRS}
)
diff --git a/src/addressbook/libebook/CMakeLists.txt b/src/addressbook/libebook/CMakeLists.txt
index 6ed4c13f6..dff694bff 100644
--- a/src/addressbook/libebook/CMakeLists.txt
+++ b/src/addressbook/libebook/CMakeLists.txt
@@ -71,6 +71,7 @@ target_include_directories(ebook PUBLIC
${CMAKE_SOURCE_DIR}/src/private
${CMAKE_SOURCE_DIR}/src/addressbook
${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
${ADDRESSBOOK_INCLUDE_DIRS}
)
diff --git a/src/calendar/libecal/CMakeLists.txt b/src/calendar/libecal/CMakeLists.txt
index 58cf6fc1a..432fdfde5 100644
--- a/src/calendar/libecal/CMakeLists.txt
+++ b/src/calendar/libecal/CMakeLists.txt
@@ -99,6 +99,7 @@ target_include_directories(ecal PUBLIC
${CMAKE_SOURCE_DIR}/src/calendar
${CMAKE_SOURCE_DIR}/src/private
${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
${CALENDAR_INCLUDE_DIRS}
)
diff --git a/src/libebackend/CMakeLists.txt b/src/libebackend/CMakeLists.txt
index ec9cdf072..61c857ed7 100644
--- a/src/libebackend/CMakeLists.txt
+++ b/src/libebackend/CMakeLists.txt
@@ -112,6 +112,7 @@ target_include_directories(ebackend PUBLIC
${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/src/private
${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
${BACKEND_INCLUDE_DIRS}
${LIBDB_INCLUDE_DIRS}
${CAMEL_INCLUDE_DIRS}
diff --git a/src/libedataserver/CMakeLists.txt b/src/libedataserver/CMakeLists.txt
index 3ade4cd0f..15c38624c 100644
--- a/src/libedataserver/CMakeLists.txt
+++ b/src/libedataserver/CMakeLists.txt
@@ -266,6 +266,7 @@ target_include_directories(edataserver PUBLIC
${CMAKE_SOURCE_DIR}/src
${CMAKE_SOURCE_DIR}/src/private
${CMAKE_CURRENT_BINARY_DIR}
+ ${CMAKE_CURRENT_SOURCE_DIR}
${DATA_SERVER_INCLUDE_DIRS}
${GCR_BASE_INCLUDE_DIRS}
${GIO_UNIX_INCLUDE_DIRS}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]