kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

BUG: put back flags to maintain backwards compatibility

This commit is contained in:
Bill Hoffman 2004-07-22 10:59:34 -04:00
parent 76c377737b
commit f929104ae8
2 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Modules/FindFLTK.cmake
View File

@ -9,6 +9,10 @@
# FLTK_VERSION_1.1 Use this Version # FLTK_VERSION_1.1 Use this Version
# FLTK_FOUND, Don't use FLTK if false. # 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. # The following settings should not be used in general.
# FLTK_BASE_LIBRARY = the full path to fltk.lib # FLTK_BASE_LIBRARY = the full path to fltk.lib
@ -125,7 +129,13 @@ IF(FLTK_FLUID_EXECUTABLE)
ENDIF(FLTK_INCLUDE_DIR) ENDIF(FLTK_INCLUDE_DIR)
ENDIF(FLTK_FLUID_EXECUTABLE) 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( MARK_AS_ADVANCED(
FLTK_VERSION_1.0.11 FLTK_VERSION_1.0.11
FLTK_VERSION_1.1 FLTK_VERSION_1.1
FLTK_WRAP_UI
) )

14
Modules/FindQt.cmake
View File

@ -14,6 +14,12 @@
# QT_QT_LIBRARY, where to find the Qt library. # 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. # 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") MESSAGE(STATUS "Checking for Qt")
FIND_PATH(QT_INCLUDE_DIR qt.h FIND_PATH(QT_INCLUDE_DIR qt.h
@ -226,6 +232,14 @@ IF(QT_FOUND)
ENDIF(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( MARK_AS_ADVANCED(