From 7172735786c43c2305a92ffd4e5d285d11f88f7f Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
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/libnrtype/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/libnrtype')

diff --git a/src/libnrtype/CMakeLists.txt b/src/libnrtype/CMakeLists.txt
index 75bb5f57b..069b68bd3 100644
--- a/src/libnrtype/CMakeLists.txt
+++ b/src/libnrtype/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 set(libnrtype_SRC
 	FontFactory.cpp
 	FontInstance.cpp
@@ -14,5 +15,5 @@ set(libnrtype_SRC
 	RasterFont.cpp
 	TextWrapper.cpp
 )
-add_library(nrtype_LIB STATIC ${libnrtype_SRC})
-target_link_libraries(nrtype_LIB nr_LIB ${INKSCAPE_LIBS})
+
+add_library(nrtype_LIB ${libnrtype_SRC})
-- 
cgit v1.2.3