diff Resources/CMake/OrthancStoneConfiguration.cmake @ 276:5de5699ad570 am-2

first display in QCairoWidget; no mouse interaction yet
author am@osimis.io
date Mon, 27 Aug 2018 12:21:52 +0200
parents dc1beee33134
children 300d8b8c48b3
line wrap: on
line diff
--- a/Resources/CMake/OrthancStoneConfiguration.cmake	Fri Aug 24 13:58:06 2018 +0200
+++ b/Resources/CMake/OrthancStoneConfiguration.cmake	Mon Aug 27 12:21:52 2018 +0200
@@ -74,16 +74,21 @@
 
 
 if (ENABLE_SDL AND ENABLE_QT)
-    message("SDL and QT may not be defined together")
+  message("SDL and QT may not be defined together")
 elseif(ENABLE_SDL)
-  include(${CMAKE_CURRENT_LIST_DIR}/SdlConfiguration.cmake)  
+  message("SDL is enabled")
+  include(${CMAKE_CURRENT_LIST_DIR}/SdlConfiguration.cmake)
   add_definitions(-DORTHANC_ENABLE_NATIVE=1)
+  add_definitions(-DORTHANC_ENABLE_QT=0)
   add_definitions(-DORTHANC_ENABLE_SDL=1)
 elseif(ENABLE_QT)
-    include(${CMAKE_CURRENT_LIST_DIR}/QtConfiguration.cmake)
-    add_definitions(-DORTHANC_ENABLE_NATIVE=1)
-    add_definitions(-DORTHANC_ENABLE_QT=1)
+  message("QT is enabled")
+  include(${CMAKE_CURRENT_LIST_DIR}/QtConfiguration.cmake)
+  add_definitions(-DORTHANC_ENABLE_NATIVE=1)
+  add_definitions(-DORTHANC_ENABLE_QT=1)
+  add_definitions(-DORTHANC_ENABLE_SDL=0)
 else()
+  message("SDL and QT are both disabled")
   unset(USE_SYSTEM_SDL CACHE)
   add_definitions(-DORTHANC_ENABLE_SDL=0)
   add_definitions(-DORTHANC_ENABLE_QT=0)
@@ -278,6 +283,7 @@
 
   # Optional components
   ${SDL_SOURCES}
+  ${QT_SOURCES}
   ${BOOST_EXTENDED_SOURCES}
   )