[evolution-etesync] Sync CMake modules with those in evolution-data-server
- From: Milan Crha <mcrha src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [evolution-etesync] Sync CMake modules with those in evolution-data-server
- Date: Mon, 19 Apr 2021 15:18:37 +0000 (UTC)
commit 542abf8b353c423777900d72f4568cf364e08ce8
Author: Milan Crha <mcrha redhat com>
Date: Mon Apr 19 17:17:23 2021 +0200
Sync CMake modules with those in evolution-data-server
To get any recent fixes in them.
cmake/modules/CheckTarget.cmake | 2 +-
cmake/modules/GLibTools.cmake | 32 +++++++++++++++++++++++---------
cmake/modules/SetupBuildFlags.cmake | 6 +++---
3 files changed, 27 insertions(+), 13 deletions(-)
---
diff --git a/cmake/modules/CheckTarget.cmake b/cmake/modules/CheckTarget.cmake
index 71824a9..85966e3 100644
--- a/cmake/modules/CheckTarget.cmake
+++ b/cmake/modules/CheckTarget.cmake
@@ -16,6 +16,6 @@ set(CMAKE_CTEST_COMMAND ${CMAKE_CTEST_COMMAND} -V)
add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND})
macro(add_check_test _name)
- add_test(NAME ${_name} COMMAND ${_name})
+ add_test(NAME ${_name} COMMAND ${_name} ${ARGN})
add_dependencies(check ${_name})
endmacro(add_check_test)
diff --git a/cmake/modules/GLibTools.cmake b/cmake/modules/GLibTools.cmake
index 300e6f4..39ccf0f 100644
--- a/cmake/modules/GLibTools.cmake
+++ b/cmake/modules/GLibTools.cmake
@@ -4,6 +4,11 @@
#
# Functions:
#
+# glib_mkenums_multiple(_output_filename_noext _define_name _enums_header ...)
+# runs glib-mkenums to generate enumtypes .h and .c files from multiple
+# _enums_header. It searches for files in the current source directory and
+# exports to the current binary directory.
+#
# glib_mkenums(_output_filename_noext _enums_header _define_name)
# runs glib-mkenums to generate enumtypes .h and .c files from _enums_header.
# It searches for files in the current source directory and exports to the current
@@ -52,18 +57,18 @@ if(NOT GLIB_MKENUMS)
message(FATAL_ERROR "Cannot find glib-mkenums, which is required to build ${PROJECT_NAME}")
endif(NOT GLIB_MKENUMS)
-function(glib_mkenums _output_filename_noext _enums_header _define_name)
+function(glib_mkenums_multiple _output_filename_noext _define_name _enums_header0)
set(HEADER_TMPL "
/*** BEGIN file-header ***/
#ifndef ${_define_name}
#define ${_define_name}
-/*** END file-header ***/
-
-/*** BEGIN file-production ***/
#include <glib-object.h>
G_BEGIN_DECLS
+/*** END file-header ***/
+
+/*** BEGIN file-production ***/
/* Enumerations from \"@basename@\" */
@@ -76,6 +81,7 @@ GType @enum_name@_get_type (void) G_GNUC_CONST;
/*** END enumeration-production ***/
/*** BEGIN file-tail ***/
+
G_END_DECLS
#endif /* ${_define_name} */
@@ -83,10 +89,14 @@ G_END_DECLS
file(WRITE
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/enumtypes-${_output_filename_noext}.h.tmpl"
"${HEADER_TMPL}\n")
+ foreach(_enums_header ${_enums_header0} ${ARGN})
+ list(APPEND _enums_headers "${CMAKE_CURRENT_SOURCE_DIR}/${_enums_header}")
+ endforeach(_enums_header)
+
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.h
- COMMAND ${GLIB_MKENUMS} --template
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/enumtypes-${_output_filename_noext}.h.tmpl"
"${CMAKE_CURRENT_SOURCE_DIR}/${_enums_header}" >${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.h
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_enums_header}
+ COMMAND ${GLIB_MKENUMS} --template
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/enumtypes-${_output_filename_noext}.h.tmpl"
${_enums_headers} >${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.h
+ DEPENDS ${_enums_headers}
)
set(SOURCE_TMPL "
@@ -104,7 +114,7 @@ set(SOURCE_TMPL "
GType
@enum_name@_get_type (void)
{
- static volatile gsize the_type__volatile = 0;
+ static gsize the_type__volatile = 0;
if (g_once_init_enter (&the_type__volatile)) {
static const G\@Type\@Value values[] = {
@@ -133,9 +143,13 @@ GType
add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.c
- COMMAND ${GLIB_MKENUMS} --template
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/enumtypes-${_output_filename_noext}.c.tmpl"
"${CMAKE_CURRENT_SOURCE_DIR}/${_enums_header}" >${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.c
- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_enums_header}
+ COMMAND ${GLIB_MKENUMS} --template
"${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/enumtypes-${_output_filename_noext}.c.tmpl"
${_enums_headers} >${CMAKE_CURRENT_BINARY_DIR}/${_output_filename_noext}.c
+ DEPENDS ${_enums_headers}
)
+endfunction(glib_mkenums_multiple)
+
+function(glib_mkenums _output_filename_noext _enums_header _define_name)
+ glib_mkenums_multiple (${_output_filename_noext} ${_define_name} ${_enums_header})
endfunction(glib_mkenums)
find_program(GLIB_GENMARSHAL glib-genmarshal)
diff --git a/cmake/modules/SetupBuildFlags.cmake b/cmake/modules/SetupBuildFlags.cmake
index 6e936df..f67f8a5 100644
--- a/cmake/modules/SetupBuildFlags.cmake
+++ b/cmake/modules/SetupBuildFlags.cmake
@@ -10,7 +10,6 @@ endif(CMAKE_CXX_COMPILER_ID)
macro(setup_build_flags _maintainer_mode)
list(APPEND proposed_flags
- -Werror-implicit-function-declaration
-Wformat
-Wformat-security
-Winit-self
@@ -21,7 +20,7 @@ macro(setup_build_flags _maintainer_mode)
-Wundef
-Wwrite-strings
-Wno-cast-function-type
- -no-undefined
+ -Wl,--no-undefined
-fno-strict-aliasing
)
@@ -35,11 +34,12 @@ macro(setup_build_flags _maintainer_mode)
else(${_maintainer_mode})
list(APPEND proposed_flags
-Wno-deprecated-declarations
- -Wno-missing-include-dir)
+ -Wno-missing-include-dirs)
endif(${_maintainer_mode})
list(APPEND proposed_c_flags
${proposed_flags}
+ -Werror-implicit-function-declaration
-Wdeclaration-after-statement
-Wno-missing-field-initializers
-Wno-sign-compare
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]