From d0a01c4ce2652c3fb0b6fb89725c56d20e94c538 Mon Sep 17 00:00:00 2001 From: "Joshua L. Blocher" Date: Fri, 9 Jan 2009 01:57:18 +0000 Subject: Cmake: restructure build files to be more like current build system. Should reduce linking stage command for windows. (bzr r7100) --- src/helper/CMakeLists.txt | 12 ++++++++---- src/helper/unit-menu.cpp | 2 +- 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'src/helper') 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 #include #include -#include "helper/sp-marshal.h" +#include "sp-marshal.h" #include "helper/units.h" #include "unit-menu.h" #include "widgets/spw-utilities.h" -- cgit v1.2.3