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

ENH: change FIND_FILE to FIND_PROGRAM

Browse Source
This commit is contained in:
Bill Hoffman 2003-01-28 15:44:45 -05:00
parent a3c282ebbd
commit e44be57f6d
2 changed files with 10 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Modules/FindFLTK.cmake
View File

@ -86,7 +86,7 @@ IF(FLTK_INCLUDE_DIR)
) )
ENDIF(FLTK_INCLUDE_DIR) ENDIF(FLTK_INCLUDE_DIR)
# Find Fluid # Find Fluid
FIND_FILE(FLTK_FLUID_EXECUTABLE fluid FIND_PROGRAM(FLTK_FLUID_EXECUTABLE fluid
${path} ${FLTK_INCLUDE_DIR}/fluid ${path} ${FLTK_INCLUDE_DIR}/fluid
) )
# Enable the Wrap UI command # Enable the Wrap UI command

37
Modules/FindQt.cmake
View File

@ -17,55 +17,36 @@
IF (UNIX) FIND_PATH(QT_INCLUDE_DIR qt.h
FIND_PATH(QT_INCLUDE_DIR qt.h
$ENV{QTDIR}/include $ENV{QTDIR}/include
/usr/local/qt/include /usr/local/qt/include
/usr/local/include /usr/local/include
/usr/include /usr/include
C:/Progra~1/qt/include
) )
FIND_LIBRARY(QT_QT_LIBRARY qt FIND_LIBRARY(QT_QT_LIBRARY qt
$ENV{QTDIR}/lib $ENV{QTDIR}/lib
/usr/local/qt/lib /usr/local/qt/lib
/usr/local/lib /usr/local/lib
/usr/lib /usr/lib
C:/Progra~1/qt/lib
) )
FIND_FILE(QT_MOC_EXECUTABLE moc FIND_PROGRAM(QT_MOC_EXECUTABLE moc
$ENV{QTDIR}/bin $ENV{QTDIR}/bin C:/Progra~1/qt/bin
) )
FIND_FILE(QT_UIC_EXECUTABLE uic FIND_PROGRAM(QT_UIC_EXECUTABLE uic
$ENV{QTDIR}/bin $ENV{QTDIR}/bin C:/Progra~1/qt/bin
) )
ENDIF (UNIX)
IF (WIN32) IF (WIN32)
# Not sure where to look for Qt under windows
# Assume that QTDIR has been set
FIND_PATH(QT_INCLUDE_DIR qt.h
$ENV{QTDIR}/include C:/Progra~1/qt/include) )
FIND_LIBRARY(QT_QT_LIBRARY qt
$ENV{QTDIR}/lib C:/Progra~1/qt/lib )
FIND_LIBRARY(QT_QTMAIN_LIBRARY qtmain FIND_LIBRARY(QT_QTMAIN_LIBRARY qtmain
$ENV{QTDIR}/lib C:/Progra~1/qt/lib $ENV{QTDIR}/lib C:/Progra~1/qt/lib
DOC "This Library is only needed by and included with Qt3 on MSWindows. It should be NOTFOUND, undefined or IGNORE otherwise." DOC "This Library is only needed by and included with Qt3 on MSWindows. It should be NOTFOUND, undefined or IGNORE otherwise."
) )
FIND_FILE(QT_MOC_EXECUTABLE moc.exe
$ENV{QTDIR}/bin C:/Progra~1/qt/bin
)
FIND_FILE(QT_UIC_EXECUTABLE uic.exe
$ENV{QTDIR}/bin C:/Progra~1/qt/bin
)
ENDIF (WIN32) ENDIF (WIN32)