Attachment 114029 Details for Bug 85418 – Add check to cmake build system if config.h.cmake is in sync with autotools

[patch] Add check to cmake build system if config.h.cmake is in sync with autotools

0001-Add-check-to-cmake-build-system-if-config.h.cmake-is-i.txt (text/plain), 3.23 KB, created by Ralf Habacker on 2015-03-05 12:48:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2015-03-05 12:48:37 UTC

Size: 3.23 KB

patch

obsolete

>From 7e090e483c97b0ae46cc4b0fcceed1d6bd5c6d61 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Thu, 5 Mar 2015 13:03:47 +0100
>Subject: [PATCH 1/3] Add check to cmake build system if config.h.cmake is in
> sync with autotools.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=85418
>---
> cmake/CMakeLists.txt                |  2 +-
> cmake/modules/MacrosAutotools.cmake | 22 ++++++++++++++--------
> 2 files changed, 15 insertions(+), 9 deletions(-)
>
>diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
>index 8c006d0..14685da 100644
>--- a/cmake/CMakeLists.txt
>+++ b/cmake/CMakeLists.txt
>@@ -17,7 +17,7 @@ endif(COMMAND cmake_policy)
> include(MacrosAutotools)
> autoinit(../configure.ac)
> autoversion(dbus)
>-autoheaderchecks(../config.h.in ConfigureChecks.cmake)
>+autoheaderchecks(../config.h.in ConfigureChecks.cmake config.h.cmake)
> # used by file version info
> set (DBUS_PATCH_VERSION "0")
> 
>diff --git a/cmake/modules/MacrosAutotools.cmake b/cmake/modules/MacrosAutotools.cmake
>index fac94a1..89828e0 100644
>--- a/cmake/modules/MacrosAutotools.cmake
>+++ b/cmake/modules/MacrosAutotools.cmake
>@@ -116,30 +116,36 @@ macro(autodefine name)
>     endforeach()
> endmacro()
> 
>-macro(autoheaderchecks config_h_in configure_checks_file)
>+macro(autoheaderchecks config_h_in configure_checks_file config_h_cmake)
>     file(READ ${configure_checks_file} configure_checks_file_raw)
>-    file(READ ${config_h_in} _config_h_raw)
>-    STRING(REGEX REPLACE ";" "\\\\;" _config_h "${_config_h_raw}")
>-    STRING(REGEX REPLACE "\n" ";" _config_h "${_config_h}")
>-    foreach(line ${_config_h})
>+    file(READ ${config_h_in} _config_h_in_raw)
>+    file(READ ${config_h_cmake} _config_h_cmake_raw)
>+    STRING(REGEX REPLACE ";" "\\\\;" _config_h_in "${_config_h_in_raw}")
>+    STRING(REGEX REPLACE "\n" ";" _config_h_in "${_config_h_in}")
>+    foreach(line ${_config_h_in})
>         #message(STATUS ${line})
>         if(line MATCHES ".*HAVE_.*_H.*")
>             string (REGEX REPLACE ".*HAVE_(.*)_H.*" "\\1" key ${line})
>+            set(full_key "HAVE_${key}_H")
>             if(key MATCHES ".*_.*")
>                 string(REGEX MATCH "^[A-Z0-9]+" dir ${key})
>                 string(REGEX MATCH "[A-Z0-9]+$" file ${key})
>                 string(TOLOWER ${dir} dirname)
>                 string(TOLOWER ${file} filename)
>-                set(check "check_include_file(${dirname}/${filename}.h     HAVE_${key}_H)")
>+                set(check "check_include_file(${dirname}/${filename}.h     ${full_key})")
>+                set(config_define "#cmakedefine ${full_key}")
>             else()
>                 set(file ${key})
>                 string(TOLOWER ${file} filename)
>-                set(check "check_include_file(${filename}.h     HAVE_${key}_H)")
>+                set(check "check_include_file(${filename}.h     ${full_key})")
>+                set(config_define "#cmakedefine ${full_key}")
>             endif()
>-            set(full_key "HAVE_${key}_H")
>             if(NOT configure_checks_file_raw MATCHES ".*${full_key}.*")
>                 message("${check}")
>             endif()
>+            if(NOT _config_h_cmake_raw MATCHES "${full_key}")
>+                message("${config_define}")
>+            endif()
>         endif()
>     endforeach()
> endmacro(autoheaderchecks)
>-- 
>1.8.4.5
>

Actions: View | Splinter Review

Attachments on bug 85418: 108368 | 108369 | 114020 | 114021 | 114029 | 114030 | 114031 | 114040

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.