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/helper/CMakeLists.txt | 48 ++++++++++++++++++++++++----------------------- 1 file changed, 25 insertions(+), 23 deletions(-) (limited to 'src/helper') diff --git a/src/helper/CMakeLists.txt b/src/helper/CMakeLists.txt index 8f42a0d5a..e2ca2336d 100644 --- a/src/helper/CMakeLists.txt +++ b/src/helper/CMakeLists.txt @@ -1,29 +1,31 @@ include(UseGlibMarshal) GLIB_MARSHAL(sp_marshal sp-marshal "${CMAKE_CURRENT_BINARY_DIR}/helper") -SET(GlibOutput -${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp -${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h + +set(GlibOutput + ${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 -stock-items.cpp -unit-menu.cpp -units.cpp -#units-test.cpp -unit-tracker.cpp -window.cpp -sp-marshal.list -# we generate this file and it's .h counter-part -${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 + stock-items.cpp + unit-menu.cpp + units.cpp + #units-test.cpp + unit-tracker.cpp + window.cpp + sp-marshal.cpp + sp-marshal.list + # we generate this file and it's .h counter-part + ${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.cpp + ${CMAKE_CURRENT_BINARY_DIR}/sp-marshal.h ) -ADD_LIBRARY(helper STATIC ${helper_SRC}) -TARGET_LINK_LIBRARIES(helper -2geom ${INKSCAPE_LIBS}) \ No newline at end of file + +add_library(helper STATIC ${helper_SRC}) +target_link_libraries(helper 2geom ${INKSCAPE_LIBS}) \ No newline at end of file -- cgit v1.2.3