Cmake: Fixed optional dependency linking

diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake
index 47224ecd680b668496cd796c5bd58bc83309ae2c..af826ed1f61671a0f67912278aa8ee9f41ede8a5 100644 (file)
--- a/CMakeScripts/ConfigInkscapeDepends.cmake
+++ b/CMakeScripts/ConfigInkscapeDepends.cmake
@@ -66,7 +66,7 @@ FOREACH(opt ${INKSCAPE_OPTIONAL})
     IF("${opt}_FOUND")\r
         message(STATUS "${opt}: FOUND")\r
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${dep_name}_CFLAGS}")\r
-        SET(INKSCAPE_LINK_FLAGS "${INKSCAPE_LINK_FLAGS} ${${dep_name}_LINK_FLAGS}")\r
+        SET(INKSCAPE_LINK_FLAGS "${INKSCAPE_LINK_FLAGS} ${${opt_name}_LINK_FLAGS}")\r
     ELSE("${opt}_FOUND")\r
         message(STATUS "${opt}: NOT FOUND")\r
     ENDIF("${opt}_FOUND")\r

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2d910633788d7445944e0d964b70396d5c02d0c6..094653cb67d93fc3d7929279caa1fbaf4fb7777b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -236,9 +236,6 @@ inkscape.rc
 inkscape-stock.cpp
 inkscape-stock.h
 inkscape_version.h.mingw
-inkview.cpp
-inkview-manifest.xml
-inkview.rc
 interface.cpp
 interface.h
 isinf.h
@@ -612,6 +609,12 @@ ${ONLY_WIN}
 ADD_EXECUTABLE(inkscape ${INKSCAPE_SRC})\r
 TARGET_LINK_LIBRARIES(inkscape\r
        "${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot\r
+)
+
+# make executable for INKVIEW
+ADD_EXECUTABLE(inkview inkview.cpp)
+TARGET_LINK_LIBRARIES(inkview\r
+       "${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot\r
 )\r
 #INSTALL(TARGETS INKSCAPE\r
 #  RUNTIME DESTINATION bin\r