From: verbalshadow <verbalshadow@users.sourceforge.net>
Date: Mon, 28 Apr 2008 21:38:04 +0000 (+0000)
Subject: Cmake: Fixed optional dependency linking
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=d9193e62c7b56f295e16cf2212401cff13ad254e;p=inkscape.git

Cmake: Fixed optional dependency linking
---

diff --git a/CMakeScripts/ConfigInkscapeDepends.cmake b/CMakeScripts/ConfigInkscapeDepends.cmake
index 47224ecd6..af826ed1f 100644
--- a/CMakeScripts/ConfigInkscapeDepends.cmake
+++ b/CMakeScripts/ConfigInkscapeDepends.cmake
@@ -66,7 +66,7 @@ FOREACH(opt ${INKSCAPE_OPTIONAL})
     IF("${opt}_FOUND")
         message(STATUS "${opt}: FOUND")
         SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${${dep_name}_CFLAGS}")
-        SET(INKSCAPE_LINK_FLAGS "${INKSCAPE_LINK_FLAGS} ${${dep_name}_LINK_FLAGS}")
+        SET(INKSCAPE_LINK_FLAGS "${INKSCAPE_LINK_FLAGS} ${${opt_name}_LINK_FLAGS}")
     ELSE("${opt}_FOUND")
         message(STATUS "${opt}: NOT FOUND")
     ENDIF("${opt}_FOUND")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2d9106337..094653cb6 100644
--- 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})
 TARGET_LINK_LIBRARIES(inkscape
 	"${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot
+)
+
+# make executable for INKVIEW
+ADD_EXECUTABLE(inkview inkview.cpp)
+TARGET_LINK_LIBRARIES(inkview
+	"${INKSCAPE_LINK_FLAGS}" 2geom avoid cola croco gdl nr nrtype vpsc livarot
 )
 #INSTALL(TARGETS INKSCAPE
 #  RUNTIME DESTINATION bin