diff options
| author | Joshua L. Blocher <verbalshadow@gmail.com> | 2009-01-09 01:57:18 +0000 |
|---|---|---|
| committer | verbalshadow <verbalshadow@users.sourceforge.net> | 2009-01-09 01:57:18 +0000 |
| commit | d0a01c4ce2652c3fb0b6fb89725c56d20e94c538 (patch) | |
| tree | ba5bb3dcc6218fa5b0f0af1b00b2f93f14fa95e1 /src/helper | |
| parent | little change to meke extensions more testables (diff) | |
| download | inkscape-d0a01c4ce2652c3fb0b6fb89725c56d20e94c538.tar.gz inkscape-d0a01c4ce2652c3fb0b6fb89725c56d20e94c538.zip | |
Cmake: restructure build files to be more like current build system. Should reduce linking stage command for windows.
(bzr r7100)
Diffstat (limited to 'src/helper')
| -rw-r--r-- | src/helper/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | src/helper/unit-menu.cpp | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt index 4ad7db1b1..fe8179199 100644 --- a/src/helper/CMakeLists.txt +++ b/src/helper/CMakeLists.txt @@ -1,13 +1,15 @@ include(UseGlibMarshal) -GLIB_MARSHAL(sp_marshal helper/sp-marshal "${CMAKE_CURRENT_BINARY_DIR}/helper") +GLIB_MARSHAL(sp_marshal sp-marshal "${CMAKE_CURRENT_BINARY_DIR}/helper") SET(GlibOutput -${CMAKE_CURRENT_BINARY_DIR}/helper/sp-marshal.cpp -${CMAKE_CURRENT_BINARY_DIR}/helper/sp-marshal.h +${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp +${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h ) SET(helper_SRC action.cpp +geom.cpp +geom-nodetype.cpp gnome-utils.cpp pixbuf-ops.cpp png-write.cpp @@ -19,5 +21,7 @@ unit-tracker.cpp window.cpp sp-marshal.list # we generate this file and it's .h counter-part -#${CMAKE_CURRENT_BINARY_DIR}/helper/sp-marshal.cpp +${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp +${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h ) +ADD_LIBRARY(helper STATIC ${helper_SRC})
\ No newline at end of file diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp index 809d8f929..19139979e 100644 --- a/src/helper/unit-menu.cpp +++ b/src/helper/unit-menu.cpp @@ -21,7 +21,7 @@ #include <gtk/gtkhbox.h> #include <gtk/gtkmenu.h> #include <gtk/gtkmenuitem.h> -#include "helper/sp-marshal.h" +#include "sp-marshal.h" #include "helper/units.h" #include "unit-menu.h" #include "widgets/spw-utilities.h" |