From 590dfb307ec728a7f68b5c59c14056b7ab79e31e Mon Sep 17 00:00:00 2001 From: Julien Michel <julien.michel@orfeo-toolbox.org> Date: Tue, 10 Mar 2015 16:14:15 +0100 Subject: [PATCH] COMP: Use the correct cmake variable to check for QtWidget module in OTB --- Code/Application/Mapla/CMakeLists.txt | 2 +- Code/Application/Monteverdi2/CMakeLists.txt | 2 +- Code/Application/Mv2/CMakeLists.txt | 2 +- Code/Common/CMakeLists.txt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Code/Application/Mapla/CMakeLists.txt b/Code/Application/Mapla/CMakeLists.txt index d7b65d3e94..3a35c67db0 100644 --- a/Code/Application/Mapla/CMakeLists.txt +++ b/Code/Application/Mapla/CMakeLists.txt @@ -118,7 +118,7 @@ target_link_libraries( mapla ${QT_QTMAIN_LIBRARY} ) -if( OTB_USE_QT4 ) +if( OTBQtWidget_LOADED ) target_link_libraries( mapla Monteverdi2_ApplicationsWrapper ) diff --git a/Code/Application/Monteverdi2/CMakeLists.txt b/Code/Application/Monteverdi2/CMakeLists.txt index 81b1346ed0..14e0c59b3b 100644 --- a/Code/Application/Monteverdi2/CMakeLists.txt +++ b/Code/Application/Monteverdi2/CMakeLists.txt @@ -89,7 +89,7 @@ target_link_libraries( Monteverdi2_Catalogue Monteverdi2_Gui ) -if (OTB_USE_QT4) +if (OTBQtWidget_LOADED) target_link_libraries( Monteverdi2_Catalogue Monteverdi2_ApplicationsWrapper ) diff --git a/Code/Application/Mv2/CMakeLists.txt b/Code/Application/Mv2/CMakeLists.txt index d67ffc0780..020fd48c4c 100644 --- a/Code/Application/Mv2/CMakeLists.txt +++ b/Code/Application/Mv2/CMakeLists.txt @@ -89,7 +89,7 @@ target_link_libraries( Monteverdi2_Mv2 Monteverdi2_Gui ) -if (OTB_USE_QT4) +if (OTBQtWidget_LOADED) target_link_libraries( Monteverdi2_Mv2 Monteverdi2_ApplicationsWrapper ) diff --git a/Code/Common/CMakeLists.txt b/Code/Common/CMakeLists.txt index 6f5f385d55..8d3e8a2422 100644 --- a/Code/Common/CMakeLists.txt +++ b/Code/Common/CMakeLists.txt @@ -3,7 +3,7 @@ add_subdirectory( Core ) add_subdirectory( Gui ) -if (OTB_USE_QT4) +if (OTBQtWidget_LOADED) message("-- Generating Qt Wrapped Applications.") add_subdirectory(ApplicationsWrapper) endif() -- GitLab