Commit 8f036034 authored by Boudewijn Rempt's avatar Boudewijn Rempt

Move libglobal to the libs folder

It's used there, so we got weird build errors if krita wasn't
built for some reason (mostly because of a missing libgsl). Add
our own tried, tested and true shared pointers to libglobal so
I can start using them in a new import/export plugin registry.
And finally, enable exceptions globally, since libglobal now
also needs them.
parent 6cc262c4
......@@ -303,6 +303,9 @@ add_definitions(
-DQT_DISABLE_DEPRECATED_BEFORE=0
)
# enable exceptions globally
kde_enable_exceptions()
# only with this definition will all the FOO_TEST_EXPORT macro do something
# TODO: check if this can be moved to only those places which make use of it,
......
......@@ -10,8 +10,6 @@ add_definitions(
-DQT_USE_FAST_CONCATENATION
)
kde_enable_exceptions()
# To avoid the confusion of an endless stream of Eigen warnings.
if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_GNUC)
add_definitions(-Wno-unused-local-typedefs -Wno-deprecated -Wno-deprecated-declarations)
......@@ -68,7 +66,6 @@ set(KRITA_INCLUDES
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/image
${CMAKE_SOURCE_DIR}/krita/libglobal
${CMAKE_SOURCE_DIR}/krita/libpsd
${CMAKE_SOURCE_DIR}/krita/image
${CMAKE_SOURCE_DIR}/krita/image/brushengine
......@@ -101,7 +98,6 @@ set(KRITA_INCLUDES
include_directories(${KRITA_INCLUDES})
add_subdirectory( libglobal )
add_subdirectory( libpsd )
add_subdirectory( image )
add_subdirectory( libbrush )
......
add_subdirectory( tests )
########### next target ###############
kde_enable_exceptions()
# Chose a tiles backend
# 1 - image/tiles
# 3 - image/tiles3
......@@ -227,7 +223,6 @@ set(kritaimage_LIB_SRCS
kis_update_outline_job.cpp
kis_update_selection_job.cpp
kis_serializable_configuration.cc
kis_shared.cc
kis_transaction_data.cpp
kis_transform_worker.cc
kis_perspectivetransform_worker.cpp
......
add_subdirectory(tests)
include_directories( ${OCIO_INCLUDE_DIR})
kde_enable_exceptions()
set(KRITA_LUTDOCKER_SOURCES
lutdocker.cpp
......
kde_enable_exceptions()
set(kritaimageenhancement_SOURCES
imageenhancement.cpp
kis_simple_noise_reducer.cpp
......
......@@ -4,8 +4,6 @@
# warning: case value ‘1002’ not in enumerated type ‘QEvent::Type’ [-Wswitch]
if (CMAKE_COMPILER_IS_GNUCXX)
add_definitions(${KDE4_ENABLE_EXCEPTIONS} -Wno-switch)
else ()
kde_enable_exceptions()
endif ()
include_directories(
......
......@@ -10,6 +10,7 @@ add_definitions(
if (SHOULD_BUILD_LIB_CALLIGRA)
add_subdirectory( version )
add_subdirectory( libglobal )
add_subdirectory( koplugin )
add_subdirectory( widgetutils )
add_subdirectory( widgets )
......@@ -19,6 +20,7 @@ if (SHOULD_BUILD_LIB_CALLIGRA)
add_subdirectory( basicflakes )
add_subdirectory( pigment )
add_subdirectory( kundo2 )
add_subdirectory( impex )
endif ()
if (SHOULD_BUILD_LIB_KOVECTORIMAGE)
......
......@@ -2,11 +2,10 @@ include(CheckFunctionExists)
check_function_exists(backtrace HAVE_BACKTRACE)
configure_file(config-debug.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-debug.h)
include_directories(${KOWIDGETS_INCLUDES})
set(kritaglobal_LIB_SRCS
kis_assert.cpp
kis_debug.cpp
kis_shared.cpp
)
add_library(kritaglobal SHARED ${kritaglobal_LIB_SRCS} )
......
......@@ -20,9 +20,9 @@
#define _KIS_SHARED_H_
#include <QAtomicInt>
#include <kritaimage_export.h>
#include "kritaglobal_export.h"
class KRITAIMAGE_EXPORT KisShared
class KRITAGLOBAL_EXPORT KisShared
{
private:
KisShared(const KisShared& );
......
......@@ -23,7 +23,6 @@ set(LINK_VC_LIB)
if(HAVE_VC)
include_directories(${Vc_INCLUDE_DIR})
set(LINK_VC_LIB ${Vc_LIBRARIES})
kde_enable_exceptions()
ko_compile_for_all_implementations_no_scalar(__per_arch_factory_objs compositeops/KoOptimizedCompositeOpFactoryPerArch.cpp)
message("Following objects are generated from the per-arch lib")
......
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