summaryrefslogtreecommitdiffstats
path: root/Modules
diff options
context:
space:
mode:
authorBill Hoffman <bill.hoffman@kitware.com>2004-07-22 14:59:34 (GMT)
committerBill Hoffman <bill.hoffman@kitware.com>2004-07-22 14:59:34 (GMT)
commitf929104ae87094aab0a9c7bd7f6b22ec5bc3f3e8 (patch)
treec8c866ac9ac3711081d676eb6a62c97e1b619580 /Modules
parent76c377737b14c782a05e8163c935b2b89cde7b7e (diff)
downloadCMake-f929104ae87094aab0a9c7bd7f6b22ec5bc3f3e8.zip
CMake-f929104ae87094aab0a9c7bd7f6b22ec5bc3f3e8.tar.gz
CMake-f929104ae87094aab0a9c7bd7f6b22ec5bc3f3e8.tar.bz2
BUG: put back flags to maintain backwards compatibility
Diffstat (limited to 'Modules')
-rw-r--r--Modules/FindFLTK.cmake10
-rw-r--r--Modules/FindQt.cmake14
2 files changed, 24 insertions, 0 deletions
diff --git a/Modules/FindFLTK.cmake b/Modules/FindFLTK.cmake
index 6680d7a..e59e17e 100644
--- a/Modules/FindFLTK.cmake
+++ b/Modules/FindFLTK.cmake
@@ -9,6 +9,10 @@
# FLTK_VERSION_1.1 Use this Version
# FLTK_FOUND, Don't use FLTK if false.
+# this is around for backwards compatibility
+# FLTK_WRAP_UI set to true if FLTK_FLUID_EXECUTABLE is found
+
+
# The following settings should not be used in general.
# FLTK_BASE_LIBRARY = the full path to fltk.lib
@@ -125,7 +129,13 @@ IF(FLTK_FLUID_EXECUTABLE)
ENDIF(FLTK_INCLUDE_DIR)
ENDIF(FLTK_FLUID_EXECUTABLE)
+
+IF (FLTK_FLUID_EXECUTABLE)
+ SET ( FLTK_WRAP_UI 1 CACHE INTERNAL "Do we have the fluid executable" )
+ENDIF (FLTK_FLUID_EXECUTABLE)
+
MARK_AS_ADVANCED(
FLTK_VERSION_1.0.11
FLTK_VERSION_1.1
+ FLTK_WRAP_UI
)
diff --git a/Modules/FindQt.cmake b/Modules/FindQt.cmake
index 737c71f..fb4821c 100644
--- a/Modules/FindQt.cmake
+++ b/Modules/FindQt.cmake
@@ -14,6 +14,12 @@
# QT_QT_LIBRARY, where to find the Qt library.
# QT_QTMAIN_LIBRARY, where to find the qtmain library. This is only required by Qt3 on Windows.
+# These are around for backwards compatibility
+# they will be set
+# QT_WRAP_CPP, set true if QT_MOC_EXECUTABLE is found
+# QT_WRAP_UI set true if QT_UIC_EXECUTABLE is found
+
+
MESSAGE(STATUS "Checking for Qt")
FIND_PATH(QT_INCLUDE_DIR qt.h
@@ -226,6 +232,14 @@ IF(QT_FOUND)
ENDIF(QT_FOUND)
+IF (QT_MOC_EXECUTABLE)
+ SET ( QT_WRAP_CPP "YES")
+ENDIF (QT_MOC_EXECUTABLE)
+
+IF (QT_UIC_EXECUTABLE)
+ SET ( QT_WRAP_UI "YES")
+ENDIF (QT_UIC_EXECUTABLE)
+
MARK_AS_ADVANCED(