diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-06-13 00:19:17 +0000 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-06-13 00:19:17 +0000 |
| commit | 7172735786c43c2305a92ffd4e5d285d11f88f7f (patch) | |
| tree | cde79c7dbcbd0d5a26c21bf136fa43b157057912 /src/libnrtype | |
| parent | cmake: fix for error reading non existing file which would error out cmake's ... (diff) | |
| download | inkscape-7172735786c43c2305a92ffd4e5d285d11f88f7f.tar.gz inkscape-7172735786c43c2305a92ffd4e5d285d11f88f7f.zip | |
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)
Diffstat (limited to 'src/libnrtype')
| -rw-r--r-- | src/libnrtype/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
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}) |