diff options
| author | Joshua L. Blocher <verbalshadow@gmail.com> | 2009-01-09 03:02:28 +0000 |
|---|---|---|
| committer | verbalshadow <verbalshadow@users.sourceforge.net> | 2009-01-09 03:02:28 +0000 |
| commit | ca949a33e4152cdf4f05cb73a806b4b40f82c4c3 (patch) | |
| tree | 0c253464abe241dbe755fd07f07ec56f4288bd52 | |
| parent | Cmake: restructure build files to be more like current build system. Should r... (diff) | |
| download | inkscape-ca949a33e4152cdf4f05cb73a806b4b40f82c4c3.tar.gz inkscape-ca949a33e4152cdf4f05cb73a806b4b40f82c4c3.zip | |
Cmake: Corrections for mistakes
(bzr r7101)
| -rw-r--r-- | src/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/display/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/display/canvas-arena.cpp | 2 | ||||
| -rw-r--r-- | src/display/sp-canvas.cpp | 2 |
4 files changed, 6 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 062d4b6b1..e30df661e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -203,8 +203,8 @@ ${ONLY_WIN} )
# All folders for internal inkscape
SET(internalfolders
-algorithms
-api
+#algorithms
+#api
application
bind
debug
@@ -223,7 +223,7 @@ pedro removeoverlap
svg
trace
-traits
+#traits
ui
util
widgets
diff --git a/src/display/CMakeLists.txt b/src/display/CMakeLists.txt index a1d61de94..66fa97462 100644 --- a/src/display/CMakeLists.txt +++ b/src/display/CMakeLists.txt @@ -54,3 +54,4 @@ sp-ctrlline.cpp sp-ctrlquadr.cpp #testnr.cpp ) +ADD_LIBRARY(display STATIC ${display_SRC})
\ No newline at end of file diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp index e01958c9f..7e00a3804 100644 --- a/src/display/canvas-arena.cpp +++ b/src/display/canvas-arena.cpp @@ -17,7 +17,7 @@ #include <display/display-forward.h> #include <display/sp-canvas-util.h> -#include <helper/sp-marshal.h> +#include "../helper/sp-marshal.h" #include <display/nr-arena.h> #include <display/nr-arena-group.h> #include <display/canvas-arena.h> diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 2c0b1e99d..419b726ca 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -28,7 +28,7 @@ #include <gtkmm.h> -#include <helper/sp-marshal.h> +#include "../helper/sp-marshal.h" #include <helper/recthull.h> #include <display/sp-canvas.h> #include "display-forward.h" |