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)

2 files changed, 13 insertions, 17 deletions

diff --git a/src/live_effects/CMakeLists.txt b/src/live_effects/CMakeLists.txt
index 61fedbe66..51f8d957c 100644
--- a/src/live_effects/CMakeLists.txt
+++ b/src/live_effects/CMakeLists.txt
@@ -1,4 +1,3 @@
-add_subdirectory(parameter)
 
 set(live_effects_SRC
 	bezctx.cpp
@@ -41,8 +40,18 @@ set(live_effects_SRC
 	lpeobject-reference.cpp
 	lpeobject.cpp
 	spiro.cpp
-	${live_effects_parameter_SRC}
+
+	parameter/array.cpp
+	parameter/bool.cpp
+	parameter/parameter.cpp
+	parameter/path.cpp
+	parameter/path-reference.cpp
+	parameter/point.cpp
+	parameter/powerstrokepointarray.cpp
+	parameter/random.cpp
+	parameter/text.cpp
+	parameter/unit.cpp
+	parameter/vector.cpp
 )
 
-add_library(live_effects_LIB STATIC ${live_effects_SRC})
-target_link_libraries(live_effects_LIB 2geom_LIB ${INKSCAPE_LIBS})
+add_library(live_effects_LIB ${live_effects_SRC})
diff --git a/src/live_effects/parameter/CMakeLists.txt b/src/live_effects/parameter/CMakeLists.txt
deleted file mode 100644
index 04a1080f4..000000000
--- a/src/live_effects/parameter/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-set(live_effects_parameter_SRC
-	array.cpp
-	bool.cpp
-	parameter.cpp
-	path.cpp
-	path-reference.cpp
-	point.cpp
-	powerstrokepointarray.cpp
-	random.cpp
-	text.cpp
-	unit.cpp
-	vector.cpp
-)