diff options
| author | houz <houz@gmx.de> | 2015-05-04 10:39:09 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2015-05-04 10:39:09 +0000 |
| commit | 2eab6fad30c9c838902d9113c7e0d41b34ce79ea (patch) | |
| tree | 1549a5e6fdd2baa7837b3ed7547a825259eb956b | |
| parent | cmake: fix copy&paste error in LibCDR check (diff) | |
| download | inkscape-2eab6fad30c9c838902d9113c7e0d41b34ce79ea.tar.gz inkscape-2eab6fad30c9c838902d9113c7e0d41b34ce79ea.zip | |
cmake: shorter linker list (remove duplicates)
(bzr r14106)
| -rw-r--r-- | CMakeScripts/DefineDependsandFlags.cmake | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/CMakeScripts/DefineDependsandFlags.cmake b/CMakeScripts/DefineDependsandFlags.cmake index 321bf63bc..dceed9560 100644 --- a/CMakeScripts/DefineDependsandFlags.cmake +++ b/CMakeScripts/DefineDependsandFlags.cmake @@ -352,6 +352,8 @@ endif() include(${CMAKE_CURRENT_LIST_DIR}/IncludeJava.cmake) # end Dependencies +list(REMOVE_DUPLICATES INKSCAPE_LIBS) +list(REMOVE_DUPLICATES INKSCAPE_INCS_SYS) # C/C++ Flags include_directories(${INKSCAPE_INCS}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 27c5e49db..efb604aca 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -519,7 +519,7 @@ add_dependencies(inkscape inkscape_version) target_link_libraries(inkscape # order from automake #sp_LIB - nrtype_LIB + #nrtype_LIB #inkscape_LIB #sp_LIB # annoying, we need both! |