Merge commit '488f24aa984ae24adc9458bf5fbf3b2351415742'

[clitk.git] / vv / CMakeLists.txt

diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt
index f20765db15245d06d899cfe091f7541e60f6a627..70c9ccd8a9a3590bf80bec970f59f9795888b6f3 100644 (file)
--- a/vv/CMakeLists.txt
+++ b/vv/CMakeLists.txt
@@ -203,7 +203,8 @@ SET(foundationLibraries clitkCommon ${ITK_LIBRARIES} QVTK vtkHybrid)
 
 #=========================================================
 #Create binary and libs for tests
-SET(vvExternalLibs clitkSegmentationGgoLib clitkDicomRTStruct ${toolLibs} ${foundationLibraries})
+SET(vvExternalLibs ${QT_QTNETWORK_LIBRARY} clitkSegmentationGgoLib clitkDicomRTStruct ${toolLibs} ${foundationLibraries})
+# QtNetwork is required by vvRegisterForm
 
 ADD_LIBRARY(vvLib ${vv_SRCS} ${vv_UI_CXX})
 TARGET_LINK_LIBRARIES(vvLib ${vvExternalLibs})
@@ -215,15 +216,14 @@ ELSE(WIN32)
 ENDIF(WIN32)
 
 #TARGET_LINK_LIBRARIES(vv vvLib)
-# QtNetwork added specifically for Fedora build
-TARGET_LINK_LIBRARIES(vv vvLib QtNetwork)
+TARGET_LINK_LIBRARIES(vv vvLib)
 
 
 #=========================================================
 # Install options (also used by CPack)
 IF(UNIX AND NOT APPLE)
   SET_TARGET_PROPERTIES(vv
-    PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}" )  
+    PROPERTIES INSTALL_RPATH "${VTK_DIR}:${ITK_DIR}/lib")
   INSTALL (TARGETS vv DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
   #  INSTALL (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/ducky.png DESTINATION .)