From f3756ff85a32f4b2a0771d0ac3bd78a69535395f Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Fri, 3 Jun 2011 11:44:52 +0100 Subject: Use generic headers in preparation for GTK+ 3 transition Fixed bugs: - https://launchpad.net/bugs/792263 (bzr r10252.1.1) --- src/debug/gdk-event-latency-tracker.h | 2 +- src/debug/log-display-config.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src/debug') diff --git a/src/debug/gdk-event-latency-tracker.h b/src/debug/gdk-event-latency-tracker.h index 12ebb6570..c3624e74f 100644 --- a/src/debug/gdk-event-latency-tracker.h +++ b/src/debug/gdk-event-latency-tracker.h @@ -12,7 +12,7 @@ #ifndef SEEN_INKSCAPE_DEBUG_GDK_EVENT_LATENCY_TRACKER_H #define SEEN_INKSCAPE_DEBUG_GDK_EVENT_LATENCY_TRACKER_H -#include +#include #include #include diff --git a/src/debug/log-display-config.cpp b/src/debug/log-display-config.cpp index d2821cc53..07380b3ad 100644 --- a/src/debug/log-display-config.cpp +++ b/src/debug/log-display-config.cpp @@ -10,8 +10,7 @@ */ #include -#include -#include +#include #include "debug/event-tracker.h" #include "debug/logger.h" #include "debug/simple-event.h" -- cgit v1.2.3 From 0ddedab9c6185028661dcaaac9f6fbca4c9e93fc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 12 Jun 2011 18:27:29 +0000 Subject: work in progress cmake commit: - cmake now builds all files that automake does but does NOT link yet - inlcudes nasty hard coded paths and libs (will replace once linking works) (bzr r10272) --- src/debug/CMakeLists.txt | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) (limited to 'src/debug') diff --git a/src/debug/CMakeLists.txt b/src/debug/CMakeLists.txt index 26c4e6934..2dab10144 100644 --- a/src/debug/CMakeLists.txt +++ b/src/debug/CMakeLists.txt @@ -1,12 +1,13 @@ -SET(debug_SRC -demangle.cpp -heap.cpp -log-display-config.cpp -logger.cpp -sysv-heap.cpp -timestamp.cpp -gdk-event-latency-tracker.cpp + +set(debug_SRC + demangle.cpp + heap.cpp + log-display-config.cpp + logger.cpp + sysv-heap.cpp + timestamp.cpp + gdk-event-latency-tracker.cpp ) -ADD_LIBRARY(debug STATIC ${debug_SRC}) -TARGET_LINK_LIBRARIES(debug -2geom ${INKSCAPE_LIBS}) \ No newline at end of file + +add_library(debug STATIC ${debug_SRC}) +target_link_libraries(debug 2geom ${INKSCAPE_LIBS}) -- cgit v1.2.3 From de03354959190a2c5392d79e03dd22dc45777e41 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 12 Jun 2011 21:27:00 +0000 Subject: cmake: give all libs a _LIB suffix, workaround 'debug' being confused with cake keyword, and also dont mix up dor names with libs. (bzr r10274) --- src/debug/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/debug') diff --git a/src/debug/CMakeLists.txt b/src/debug/CMakeLists.txt index 2dab10144..6727817f9 100644 --- a/src/debug/CMakeLists.txt +++ b/src/debug/CMakeLists.txt @@ -9,5 +9,5 @@ set(debug_SRC gdk-event-latency-tracker.cpp ) -add_library(debug STATIC ${debug_SRC}) -target_link_libraries(debug 2geom ${INKSCAPE_LIBS}) +add_library(debug_LIB STATIC ${debug_SRC}) +target_link_libraries(debug_LIB 2geom_LIB ${INKSCAPE_LIBS}) -- cgit v1.2.3 From 7172735786c43c2305a92ffd4e5d285d11f88f7f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 13 Jun 2011 00:19:17 +0000 Subject: cmake: turns out my recent commits (which I undid) were not incorrect, variables were set in subdirectories then used in the parent directory, where they were still unset. Fixing this broke the build because some files in the subdir were not compiling. (bzr r10276) --- src/debug/CMakeLists.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/debug') diff --git a/src/debug/CMakeLists.txt b/src/debug/CMakeLists.txt index 6727817f9..0c5760366 100644 --- a/src/debug/CMakeLists.txt +++ b/src/debug/CMakeLists.txt @@ -9,5 +9,4 @@ set(debug_SRC gdk-event-latency-tracker.cpp ) -add_library(debug_LIB STATIC ${debug_SRC}) -target_link_libraries(debug_LIB 2geom_LIB ${INKSCAPE_LIBS}) +add_library(debug_LIB ${debug_SRC}) -- cgit v1.2.3 From 2c5f1ac093f8d674dae8fc1cae88862d02468356 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 13 Jun 2011 02:33:03 +0000 Subject: cmake: now builds without having most of the source listed in 1 file. (bzr r10278) --- src/debug/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/debug') diff --git a/src/debug/CMakeLists.txt b/src/debug/CMakeLists.txt index 0c5760366..9039d52bb 100644 --- a/src/debug/CMakeLists.txt +++ b/src/debug/CMakeLists.txt @@ -9,4 +9,5 @@ set(debug_SRC gdk-event-latency-tracker.cpp ) -add_library(debug_LIB ${debug_SRC}) +# add_library(debug_LIB ${debug_SRC}) +add_inkscape_source("${debug_SRC}") -- cgit v1.2.3 From b7a4f23ed217a36eaaefe8f707bcc1b968d1e562 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 13 Jun 2011 05:39:42 +0000 Subject: cmake: - group source/headers per library (for some IDE's) - include headers with source listing (also for IDE's) - remove unneeded Find modules (bzr r10281) --- src/debug/CMakeLists.txt | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) (limited to 'src/debug') diff --git a/src/debug/CMakeLists.txt b/src/debug/CMakeLists.txt index 9039d52bb..5c0354fce 100644 --- a/src/debug/CMakeLists.txt +++ b/src/debug/CMakeLists.txt @@ -7,7 +7,22 @@ set(debug_SRC sysv-heap.cpp timestamp.cpp gdk-event-latency-tracker.cpp + + + # ------ + # Header + demangle.h + event-tracker.h + event.h + gc-heap.h + gdk-event-latency-tracker.h + heap.h + log-display-config.h + logger.h + simple-event.h + sysv-heap.h + timestamp.h ) -# add_library(debug_LIB ${debug_SRC}) +# add_inkscape_lib(debug_LIB "${debug_SRC}") add_inkscape_source("${debug_SRC}") -- cgit v1.2.3 From 4e51446f417ad82d2cdac758d0c5ce908ff88038 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Thu, 8 Dec 2011 11:53:54 +0000 Subject: Switch to top-level glib headers. Thanks to DimStar for patch Fixed bugs: - https://launchpad.net/bugs/898538 (bzr r10762) --- src/debug/logger.cpp | 2 +- src/debug/simple-event.h | 2 -- src/debug/timestamp.cpp | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) (limited to 'src/debug') diff --git a/src/debug/logger.cpp b/src/debug/logger.cpp index bc761d67e..485dbc365 100644 --- a/src/debug/logger.cpp +++ b/src/debug/logger.cpp @@ -11,7 +11,7 @@ #include #include -#include +#include #include "inkscape-version.h" #include "debug/logger.h" #include "debug/simple-event.h" diff --git a/src/debug/simple-event.h b/src/debug/simple-event.h index d09358224..506ee1b03 100644 --- a/src/debug/simple-event.h +++ b/src/debug/simple-event.h @@ -15,8 +15,6 @@ #include #include #include // g_assert() -#include -#include #include "gc-alloc.h" #include "debug/event.h" diff --git a/src/debug/timestamp.cpp b/src/debug/timestamp.cpp index 4c014e965..e100134c8 100644 --- a/src/debug/timestamp.cpp +++ b/src/debug/timestamp.cpp @@ -10,8 +10,7 @@ */ -#include -#include +#include #include #include "debug/simple-event.h" -- cgit v1.2.3