X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FCMakeLists.txt;h=e9cd2d260b858ebed1333bb12ecd458d7c5266c2;hb=db9d3e7eb7bcb35f127e10af368cce7c3c9f2820;hp=4d5c36b1292e1c1ad4398697ccb3daae66aceebe;hpb=49ae46d2b5aed3962b711b76b93ebb739baa1d30;p=clitk.git diff --git a/vv/CMakeLists.txt b/vv/CMakeLists.txt index 4d5c36b..e9cd2d2 100644 --- a/vv/CMakeLists.txt +++ b/vv/CMakeLists.txt @@ -181,10 +181,6 @@ INCLUDE_DIRECTORIES( ../segmentation ) -IF(WIN32) - SET(EXE_ICON vvIcon.rc) -ENDIF(WIN32) - LINK_DIRECTORIES(${QT_LIBRARY_DIR}) #========================================================= #Add each tool's dependencies @@ -198,13 +194,20 @@ SET(foundationLibraries clitkCommon ${ITK_LIBRARIES} QVTK vtkHybrid) #========================================================= #Create binary and libs for tests -SET(vvExternalLibs clitkSegmentationGgoLib clitkDicomRTStruct ${toolLibs} ${foundationLibraries} CACHE INTERNAL DOCSTRING) -ADD_EXECUTABLE(vv ${vv_SRCS} vv.cxx ${vv_UI_CXX} ${EXE_ICON}) -ADD_DEPENDENCIES(vv clitkSegmentationGgoLib) -IF(BUILD_TESTING) - target_link_libraries(vv ${vvExternalLibs}) - add_library(vvLib ${vv_SRCS} vv.cxx ${vv_UI_CXX} ${EXE_ICON}) -ENDIF(BUILD_TESTING) +SET(vvExternalLibs clitkSegmentationGgoLib clitkDicomRTStruct ${toolLibs} ${foundationLibraries}) + +ADD_LIBRARY(vvLib ${vv_SRCS} ${vv_UI_CXX}) +TARGET_LINK_LIBRARIES(vvLib ${vvExternalLibs}) + +IF(WIN32) + ADD_EXECUTABLE(vv WIN32 vv.cxx vvIcon.rc) +ELSE(WIN32) + ADD_EXECUTABLE(vv vv.cxx) +ENDIF(WIN32) + +TARGET_LINK_LIBRARIES(vv vvLib) + + #========================================================= # Install options (also used by CPack) IF(UNIX AND NOT APPLE) @@ -263,4 +266,4 @@ INCLUDE(CPack) #========================================================= #========================================================= configure_file(vvCommon.h.in vvCommon.h) -#========================================================= \ No newline at end of file +#=========================================================