diff options
| author | Joshua L. Blocher <verbalshadow@gmail.com> | 2008-05-19 22:57:01 +0000 |
|---|---|---|
| committer | verbalshadow <verbalshadow@users.sourceforge.net> | 2008-05-19 22:57:01 +0000 |
| commit | 5b60010f65106be41d91ffedf6039779ffdd29b9 (patch) | |
| tree | 912e04deb06524ae6a0c30d5f693d76159d8d13d /src | |
| parent | second part of LPE skeleton correction from commit #18654 ;-) (diff) | |
| download | inkscape-5b60010f65106be41d91ffedf6039779ffdd29b9.tar.gz inkscape-5b60010f65106be41d91ffedf6039779ffdd29b9.zip | |
Cmake: Fix issue with generated sp-marshall.h/.cpp not linking
(bzr r5715)
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/helper/CMakeLists.txt | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bf2492c50..6c4d475be 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -575,7 +575,7 @@ FOREACH(dirlist ${srcfolders}) SET(INKSCAPE_SRC ${INKSCAPE_SRC} ${${dirlist}_SRC})
ENDFOREACH(dirlist)
-
+SET(INKSCAPE_SRC ${INKSCAPE_SRC} ${GlibOutput})
# All directories containing lists files that describe building internal libraries
SET(libfolders 2geom
diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt index 223301743..4ad7db1b1 100644 --- a/src/helper/CMakeLists.txt +++ b/src/helper/CMakeLists.txt @@ -1,6 +1,10 @@ include(UseGlibMarshal) GLIB_MARSHAL(sp_marshal helper/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 +) SET(helper_SRC action.cpp @@ -15,5 +19,5 @@ unit-tracker.cpp window.cpp sp-marshal.list # we generate this file and it's .h counter-part -#sp-marshal.cpp +#${CMAKE_CURRENT_BINARY_DIR}/helper/sp-marshal.cpp ) |