Commit ff3f4860 authored by Ralf Habacker's avatar Ralf Habacker

Use dbus/dbus-arch-deps.h.in as source for cmake too

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=41033Reviewed-by: default avatarSimon McVittie <simon.mcvittie@collabora.co.uk>
parent 17678401
......@@ -54,43 +54,39 @@ check_type_size("__int64" SIZEOF___INT64)
if(SIZEOF_INT EQUAL 8)
set (DBUS_HAVE_INT64 1)
set (DBUS_INT64_TYPE "int")
else(SIZEOF_INT EQUAL 8)
if(SIZEOF_LONG EQUAL 8)
set (DBUS_HAVE_INT64 1)
set (DBUS_INT64_TYPE "long")
else(SIZEOF_LONG EQUAL 8)
if(SIZEOF_LONG_LONG EQUAL 8)
set (DBUS_HAVE_INT64 1)
set (DBUS_INT64_TYPE "long long")
else(SIZEOF_LONG_LONG EQUAL 8)
if(SIZEOF___INT64 EQUAL 8)
set (DBUS_HAVE_INT64 1)
set (DBUS_INT64_TYPE "__int64")
endif(SIZEOF___INT64 EQUAL 8)
endif(SIZEOF_LONG_LONG EQUAL 8)
endif(SIZEOF_LONG EQUAL 8)
set (DBUS_INT64_CONSTANT "(val)")
set (DBUS_UINT64_CONSTANT "(val##U)")
elseif(SIZEOF_LONG EQUAL 8)
set (DBUS_HAVE_INT64 1)
set (DBUS_INT64_TYPE "long")
set (DBUS_INT64_CONSTANT "(val##L)")
set (DBUS_UINT64_CONSTANT "(val##UL)")
elseif(SIZEOF_LONG_LONG EQUAL 8)
set (DBUS_HAVE_INT64 1)
set (DBUS_INT64_TYPE "long long")
set (DBUS_INT64_CONSTANT "(val##LL)")
set (DBUS_UINT64_CONSTANT "(val##ULL)")
elseif(SIZEOF___INT64 EQUAL 8)
set (DBUS_HAVE_INT64 1)
set (DBUS_INT64_TYPE "__int64")
set (DBUS_INT64_CONSTANT "(val##i64)")
set (DBUS_UINT64_CONSTANT "(val##ui64)")
endif(SIZEOF_INT EQUAL 8)
# DBUS_INT32_TYPE
if(SIZEOF_INT EQUAL 4)
set (DBUS_INT32_TYPE "int")
else(SIZEOF_INT EQUAL 4)
if(SIZEOF_LONG EQUAL 4)
set (DBUS_INT32_TYPE "long")
else(SIZEOF_LONG EQUAL 4)
if(SIZEOF_LONG_LONG EQUAL 4)
set (DBUS_INT32_TYPE "long long")
endif(SIZEOF_LONG_LONG EQUAL 4)
endif(SIZEOF_LONG EQUAL 4)
elseif(SIZEOF_LONG EQUAL 4)
set (DBUS_INT32_TYPE "long")
elseif(SIZEOF_LONG_LONG EQUAL 4)
set (DBUS_INT32_TYPE "long long")
endif(SIZEOF_INT EQUAL 4)
# DBUS_INT16_TYPE
if(SIZEOF_INT EQUAL 2)
set (DBUS_INT16_TYPE "int")
else(SIZEOF_INT EQUAL 2)
if(SIZEOF_SHORT EQUAL 2)
set (DBUS_INT16_TYPE "short")
endif(SIZEOF_SHORT EQUAL 2)
elseif(SIZEOF_SHORT EQUAL 2)
set (DBUS_INT16_TYPE "short")
endif(SIZEOF_INT EQUAL 2)
find_program(DOXYGEN doxygen)
......
......@@ -2,7 +2,7 @@ project(dbus-lib)
SET(DBUS_DIR ${CMAKE_SOURCE_DIR}/../dbus)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/dbus-arch-deps.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/dbus-arch-deps.h )
configure_file(${DBUS_DIR}/dbus-arch-deps.h.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-arch-deps.h )
add_definitions(-DDBUS_COMPILATION)
......
/* -*- mode: C; c-file-style: "gnu" -*- */
/* dbus-arch-deps.h Header with architecture/compiler specific information, installed to libdir
*
* Copyright (C) 2003 Red Hat, Inc.
*
* Licensed under the Academic Free License version 2.0
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
#if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION)
#error "Only <dbus/dbus.h> can be included directly, this file may disappear or change contents."
#endif
#ifndef DBUS_ARCH_DEPS_H
#define DBUS_ARCH_DEPS_H
#include <dbus/dbus-macros.h>
DBUS_BEGIN_DECLS;
#cmakedefine DBUS_HAVE_INT64 1
#if DBUS_HAVE_INT64
typedef @DBUS_INT64_TYPE@ dbus_int64_t;
typedef unsigned @DBUS_INT64_TYPE@ dbus_uint64_t;
#define DBUS_INT64_CONSTANT(val) (val##LL)
#define DBUS_UINT64_CONSTANT(val) (val##ULL)
#else
#undef DBUS_HAVE_INT64
#undef DBUS_INT64_CONSTANT
#undef DBUS_UINT64_CONSTANT
#endif
typedef @DBUS_INT32_TYPE@ dbus_int32_t;
typedef unsigned @DBUS_INT32_TYPE@ dbus_uint32_t;
typedef @DBUS_INT16_TYPE@ dbus_int16_t;
typedef unsigned @DBUS_INT16_TYPE@ dbus_uint16_t;
/* This is not really arch-dependent, but it's not worth
* creating an additional generated header just for this
*/
#define DBUS_MAJOR_VERSION @DBUS_MAJOR_VERSION@
#define DBUS_MINOR_VERSION @DBUS_MINOR_VERSION@
#define DBUS_MICRO_VERSION @DBUS_MICRO_VERSION@
#define DBUS_VERSION_STRING "@DBUS_VERSION@"
#define DBUS_VERSION ((@DBUS_MAJOR_VERSION@ << 16) | (@DBUS_MINOR_VERSION@ << 8) | (@DBUS_MICRO_VERSION@))
DBUS_END_DECLS;
#endif /* DBUS_ARCH_DEPS_H */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment