X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=84ffae065db79a01b961670ff500f14ab79e9c43;hb=75d074a4caf86e1c036bc7879557a1600ad0ceac;hp=9f449b993cde98b21a0d1c63677b621435e9f187;hpb=40fa87851b8937cb8cd98699e9e8c5dd2ef5f932;p=clitk.git diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt index 9f449b9..84ffae0 100644 --- a/vv/CMakeLists.txt +++ b/vv/CMakeLists.txt @@ -94,6 +94,8 @@ SET(vv_SRCS vvImageContour.cxx vvBinaryImageOverlayActor.cxx vvStructureSetActor.cxx + vvSaveState.cxx + vvReadState.cxx vvROIActor.cxx vvBlendImageActor.cxx vvToolManager.cxx @@ -203,7 +205,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}) @@ -214,6 +217,7 @@ ELSE(WIN32) ADD_EXECUTABLE(vv vv.cxx) ENDIF(WIN32) +#TARGET_LINK_LIBRARIES(vv vvLib) TARGET_LINK_LIBRARIES(vv vvLib) @@ -221,7 +225,7 @@ 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}") 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 .) @@ -250,7 +254,7 @@ SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/ReadMe.txt") SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/License.txt") SET(CPACK_PACKAGE_VERSION_MAJOR "1") SET(CPACK_PACKAGE_VERSION_MINOR "2") -SET(CPACK_PACKAGE_VERSION_PATCH "1") +SET(CPACK_PACKAGE_VERSION_PATCH "2") SET(CPACK_PACKAGE_INSTALL_DIRECTORY "vv") SET(CPACK_STRIP_FILES TRUE)