Revision: 56234
http://sourceforge.net/p/brlcad/code/56234
Author: starseeker
Date: 2013-07-26 13:59:40 +0000 (Fri, 26 Jul 2013)
Log Message:
-----------
Fix Qt compilation enablement logic - the only time to override the user
setting is when we can't do what they asked due to system limitations.
Modified Paths:
--------------
brlcad/trunk/CMakeLists.txt
Modified: brlcad/trunk/CMakeLists.txt
===================================================================
--- brlcad/trunk/CMakeLists.txt 2013-07-26 13:21:22 UTC (rev 56233)
+++ brlcad/trunk/CMakeLists.txt 2013-07-26 13:59:40 UTC (rev 56234)
@@ -1096,9 +1096,9 @@
find_package(Qt5Widgets QUIET)
option(BRLCAD_ENABLE_QT "Enable features requiring Qt" OFF)
mark_as_advanced(BRLCAD_ENABLE_QT)
-if(Qt5Widgets_FOUND)
- set(BRLCAD_ENABLE_QT ON)
-endif(Qt5Widgets_FOUND)
+if(NOT Qt5Widgets_FOUND AND BRLCAD_ENABLE_QT)
+ set(BRLCAD_ENABLE_QT OFF)
+endif(NOT Qt5Widgets_FOUND AND BRLCAD_ENABLE_QT)
mark_as_advanced(Qt5Widgets_DIR)
#----------------------------------------------------------------------
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
See everything from the browser to the database with AppDynamics
Get end-to-end visibility with application monitoring from AppDynamics
Isolate bottlenecks and diagnose root cause in seconds.
Start your free trial of AppDynamics Pro today!
http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
