Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit 36038c79 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Replace several config files with a KoConfig.h file

Someone from cygwin pointed out that we install config files
to /usr/include that have insufficiently differentiated names.
Pinotree suggested we use a KoConfig.h instead, which is much
more sane. This patch replaces all toplevel config files with
KoConfig.h and uses that throughout our code.

svn path=/trunk/koffice/; revision=1138092
parent f5fdfffb
......@@ -30,7 +30,6 @@ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules )
#option(BUILD_kexi "Build directory kexi" OFF) # kexi isn't buildable at the moment
option(GHNS "support Get Hot New Stuff" ON)
configure_file(config-ghns.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ghns.h )
option(TINY "compile a tiny KOffice" OFF)
......@@ -92,7 +91,6 @@ option(GHNS "support Get Hot New Stuff" ON)
if(KDE_VERSION LESS "4.4.0")
set(GHNS FALSE)
endif(KDE_VERSION LESS "4.4.0")
configure_file(config-ghns.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ghns.h )
###########################
############################
......@@ -117,8 +115,6 @@ endif (APPLE)
macro_optional_find_package(OpenEXR)
macro_bool_to_01(OPENEXR_FOUND HAVE_OPENEXR)
configure_file(config-openexr.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-openexr.h )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/config-openexr.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
###########################
......@@ -146,7 +142,6 @@ else(OPENGL_FOUND)
message(STATUS "Did NOT find OpenGL libraries")
endif(OPENGL_FOUND)
configure_file(config-opengl.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-opengl.h )
macro_log_feature(HAVE_OPENGL "OpenGL" "OpenGL support" "" FALSE "" "Required by parts of Krita and optionally by flake")
##
......@@ -251,12 +246,10 @@ endif(WIN32)
##
include (TestBigEndian)
TEST_BIG_ENDIAN(CMAKE_WORDS_BIGENDIAN)
configure_file(config-endian.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-endian.h )
##
## Generate a file for prefix information
##
configure_file(config-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h )
####################
#####################
......@@ -507,3 +500,6 @@ macro_display_application_enabled(koreport ${SHOULD_BUILD_KOREPORT})
message(STATUS "--------------------------------------------------------------------------" )
add_custom_target(apidox doc/api/gendocs.pl WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
configure_file(KoConfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/KoConfig.h )
install( FILES ${CMAKE_CURRENT_BINARY_DIR}/KoConfig.h DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
#ifdef __APPLE__
# ifdef __BIG_ENDIAN__
# define WORDS_BIGENDIAN 1
# else
# undef WORDS_BIGENDIAN
# endif
#else
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
#cmakedefine WORDS_BIGENDIAN ${CMAKE_WORDS_BIGENDIAN}
#endif
/* Defines if you Get Hot New Stuff support */
#cmakedefine GHNS 1
/* Number of bits in a file offset, on hosts where this is settable. */
#define _FILE_OFFSET_BITS 64
/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
/* #undef _LARGEFILE_SOURCE */
/* Define for large files, on AIX-style hosts. */
/* #undef _LARGE_FILES */
/* Defines if your system has the OpenEXR library */
#cmakedefine HAVE_OPENEXR 1
/* Defines if you have GL (Mesa, OpenGL, ...) and Qt GL support */
#cmakedefine HAVE_OPENGL 1
/* This file contains all the paths that change when changing the installation prefix */
#define KOFFICEPREFIX "${CMAKE_INSTALL_PREFIX}"
<!DOCTYPE params>
<params version="1">
<param name="nTransfers">1</param>
<param name="curve0">0,0;1,1;</param>
</params>
......@@ -285,20 +285,3 @@ install( FILES
generator/kis_generator.h
generator/kis_generator_registry.h
DESTINATION ${INCLUDE_INSTALL_DIR})
#install( FILES kis_debug.h kis_global.h kis_annotation.h
#kis_shared_ptr_vector.h kis_undo_adapter.h kis_progress_subject.h
#kis_progress_display_interface.h kis_adjustment_layer.h
#kis_autogradient_resource.h
#kis_command.h kis_convolution_painter.h kis_fill_painter.h
#kis_filter.h kis_filter_registry.h kis_gradient.h
#kis_gradient_painter.h kis_histogram.h kis_image.h
# kis_iterator.h kis_iterators_pixel.h
#kis_iteratorpixeltrait.h kis_layer.h kis_meta_registry.h
#kis_nameserver.h kis_paint_device.h kis_painter.h kis_paintop.h
#kis_paintop_registry.h kis_palette.h kis_pattern.h
#kis_resource.h kis_selection.h kis_transaction.h kis_types.h
#kis_vec.h kis_filter_config_widget.h kis_filter_configuration.h
#kis_exif_info.h kis_exif_value.h kis_perspective_grid.h
#kis_perspective_math.h kis_threaded_applicator.h DESTINATION ${INCLUDE_INSTALL_DIR})
......@@ -24,7 +24,7 @@
#include <kglobal.h>
#include <kofficeversion.h>
#include <config-opengl.h>
#include <KoConfig.h>
#define KRITA_VERSION KOFFICE_VERSION
......
......@@ -19,7 +19,7 @@
#include "kis_image.h"
#include <config-endian.h> // WORDS_BIGENDIAN
#include <KoConfig.h> // WORDS_BIGENDIAN
#include <stdlib.h>
#include <math.h>
......
......@@ -20,7 +20,7 @@
#include "kis_math_toolbox.h"
#include <config-openexr.h>
#include <KoConfig.h>
#ifdef HAVE_OPENEXR
#include <half.h>
......
......@@ -35,7 +35,7 @@ QString KoCtlChannelImpl<float>::normalisedChannelValueText(const quint8* pixel)
return QString::number(double(scaleToF32(pixel)));
}
#include <config-openexr.h>
#include <KoConfig.h>
#ifdef HAVE_OPENEXR
template<>
......
......@@ -18,7 +18,7 @@
*/
#include "kis_hsv_adjustment.h"
#include <config-openexr.h>
#include <KoConfig.h>
#ifdef HAVE_OPENEXR
#include <half.h>
#endif
......
......@@ -17,7 +17,7 @@
#include "kis_color_input.h"
#include <config-openexr.h>
#include <KoConfig.h>
#ifdef HAVE_OPENEXR
#include <half.h>
#endif
......
......@@ -24,7 +24,7 @@
#include "kis_soft_paintop_settings_widget.h"
#include <config-opengl.h>
#include <KoConfig.h>
#if defined(_WIN32) || defined(_WIN64)
# include <windows.h>
......
......@@ -55,7 +55,7 @@ QPen KisGridPainterConfiguration::subdivisionPen()
#if 0
#include <config-opengl.h>
#include <KoConfig.h>
#ifdef HAVE_OPENGL
#include <qgl.h>
......
......@@ -26,7 +26,7 @@
#define PNG_MAX_UINT UINT_MAX
#endif
#include <config-endian.h> // WORDS_BIGENDIAN
#include <KoConfig.h> // WORDS_BIGENDIAN
#include <limits.h>
#include <stdio.h>
......
......@@ -20,7 +20,7 @@
/** @file */
#include <config-opengl.h>
#include <KoConfig.h>
#include <config-glew.h>
#ifdef HAVE_OPENGL
......
......@@ -26,7 +26,7 @@
#include <QImage>
#include <QApplication>
#include <config-openexr.h>
#include <KoConfig.h>
#ifdef HAVE_OPENEXR
#include <half.h>
......
......@@ -43,7 +43,7 @@
#include <QtGui/QDockWidget>
#include <QtCore/QTimer>
#include <config-opengl.h>
#include <KoConfig.h>
#ifdef HAVE_OPENGL
#include <QtOpenGL/QGLWidget>
......
......@@ -20,7 +20,7 @@
#include "KoGlobal.h"
#include <config-prefix.h>
#include <KoConfig.h>
#include <QtGui/QPaintDevice>
#include <QtGui/QFont>
......
......@@ -21,7 +21,7 @@
#include <QString>
#include <klocale.h>
#include <config-openexr.h>
#include <KoConfig.h>
#ifdef HAVE_OPENEXR
#include <half.h>
#endif
......
......@@ -24,7 +24,7 @@
#include <QtCore/QVector>
#include <klocale.h>
#include <config-openexr.h>
#include <KoConfig.h>
#include "KoColorSpace.h"
#include "KoID.h"
......
......@@ -105,7 +105,7 @@ public:
static const KoChannelInfo::enumChannelValueType channelValueType;
};
#include <config-openexr.h>
#include <KoConfig.h>
#ifdef HAVE_OPENEXR
#include <half.h>
......
......@@ -27,7 +27,7 @@
#include <QModelIndex>
#include "kowidgets_export.h"
#include <config-ghns.h>
#include <KoConfig.h>
class QAbstractProxyModel;
class QButtonGroup;
......
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