From 7172735786c43c2305a92ffd4e5d285d11f88f7f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 13 Jun 2011 00:19:17 +0000 Subject: cmake: turns out my recent commits (which I undid) were not incorrect, variables were set in subdirectories then used in the parent directory, where they were still unset. Fixing this broke the build because some files in the subdir were not compiling. (bzr r10276) --- src/trace/CMakeLists.txt | 13 +++++++++---- src/trace/potrace/CMakeLists.txt | 9 --------- 2 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 src/trace/potrace/CMakeLists.txt (limited to 'src/trace') diff --git a/src/trace/CMakeLists.txt b/src/trace/CMakeLists.txt index d3bdcb6b1..84aab77e2 100644 --- a/src/trace/CMakeLists.txt +++ b/src/trace/CMakeLists.txt @@ -1,4 +1,3 @@ -add_subdirectory(potrace) set(trace_SRC filterset.cpp @@ -7,8 +6,14 @@ set(trace_SRC quantize.cpp siox.cpp trace.cpp - ${trace_potrace_SRC} + + potrace/curve.cpp + potrace/decompose.cpp + potrace/greymap.cpp + potrace/inkscape-potrace.cpp + potrace/potracelib.cpp + potrace/render.cpp + potrace/trace.cpp ) -ADD_LIBRARY(trace_LIB STATIC ${trace_SRC}) -TARGET_LINK_LIBRARIES(trace_LIB 2geom_LIB ${INKSCAPE_LIBS}) +add_library(trace_LIB ${trace_SRC}) diff --git a/src/trace/potrace/CMakeLists.txt b/src/trace/potrace/CMakeLists.txt deleted file mode 100644 index e48d7689f..000000000 --- a/src/trace/potrace/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -set(trace_potrace_SRC - curve.cpp - decompose.cpp - greymap.cpp - inkscape-potrace.cpp - potracelib.cpp - render.cpp - trace.cpp -) -- cgit v1.2.3