mirror of https://github.com/CGAL/cgal
Make FindQt3.cmake use variables prefixed by QT3_, instead of QT_ (that was
conflicting with FindQt4.cmake).
This commit is contained in:
parent
3415870ee5
commit
7306ccbf56
|
|
@ -1645,6 +1645,7 @@ Installation/cmake/modules/FindMPFR.cmake -text
|
|||
Installation/cmake/modules/FindOpenGL.cmake -text
|
||||
Installation/cmake/modules/FindPackageHandleStandardArgs.cmake -text
|
||||
Installation/cmake/modules/FindQGLViewer.cmake -text
|
||||
Installation/cmake/modules/FindQt3.cmake -text
|
||||
Installation/cmake/modules/FindTAUCS.cmake -text
|
||||
Installation/cmake/modules/GeneratorSpecificSettings.cmake -text
|
||||
Installation/cmake/modules/MacroFindOptionalCGALDependency.cmake -text
|
||||
|
|
|
|||
|
|
@ -0,0 +1,318 @@
|
|||
# - Locate Qt include paths and libraries
|
||||
# This module defines:
|
||||
# QT3_INCLUDE_DIR - where to find qt.h, etc.
|
||||
# QT3_LIBRARIES - the libraries to link against to use Qt.
|
||||
# QT3_DEFINITIONS - definitions to use when
|
||||
# compiling code that uses Qt.
|
||||
# QT3_FOUND - If false, don't try to use Qt.
|
||||
#
|
||||
# If you need the multithreaded version of Qt, set QT3_MT_REQUIRED to TRUE
|
||||
#
|
||||
# Also defined, but not for general use are:
|
||||
# QT3_MOC_EXECUTABLE, where to find the moc tool.
|
||||
# QT3_UIC_EXECUTABLE, where to find the uic tool.
|
||||
# QT3_QT_LIBRARY, where to find the Qt library.
|
||||
# QT3_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
|
||||
# QT3_WRAP_CPP, set true if3 QT_MOC_EXECUTABLE is found
|
||||
# QT3_WRAP_UI set true if QT3_UIC_EXECUTABLE is found
|
||||
|
||||
FILE(GLOB GLOB_PATHS_BIN /usr/lib/qt-3*/bin/)
|
||||
FIND_PATH(QT3_INCLUDE_DIR qt.h
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
|
||||
$ENV{QTDIR}/include
|
||||
${GLOB_PATHS_BIN}
|
||||
/usr/local/qt/include
|
||||
/usr/lib/qt/include
|
||||
/usr/lib/qt3/include
|
||||
/usr/include/qt
|
||||
/usr/share/qt3/include
|
||||
C:/Progra~1/qt/include
|
||||
/usr/include/qt3
|
||||
/usr/X11R6/include
|
||||
)
|
||||
|
||||
# if qglobal.h is not in the qt_include_dir then set
|
||||
# QT3_INCLUDE_DIR to NOTFOUND
|
||||
IF(NOT EXISTS ${QT3_INCLUDE_DIR}/qglobal.h)
|
||||
SET(QT3_INCLUDE_DIR QT3_INCLUDE_DIR-NOTFOUND CACHE PATH "path to qt3 include directory" FORCE)
|
||||
ENDIF(NOT EXISTS ${QT3_INCLUDE_DIR}/qglobal.h)
|
||||
|
||||
IF(QT3_INCLUDE_DIR)
|
||||
#extract the version string from qglobal.h
|
||||
FILE(READ ${QT3_INCLUDE_DIR}/qglobal.h QGLOBAL_H)
|
||||
STRING(REGEX MATCH "#define[\t ]+QT_VERSION_STR[\t ]+\"([0-9]+.[0-9]+.[0-9]+)\"" QGLOBAL_H "${QGLOBAL_H}")
|
||||
STRING(REGEX REPLACE ".*\"([0-9]+.[0-9]+.[0-9]+)\".*" "\\1" qt_version_str "${QGLOBAL_H}")
|
||||
|
||||
# Under windows the qt library (MSVC) has the format qt-mtXYZ where XYZ is the
|
||||
# version X.Y.Z, so we need to remove the dots from version
|
||||
STRING(REGEX REPLACE "\\." "" qt_version_str_lib "${qt_version_str}")
|
||||
ELSE(QT3_INCLUDE_DIR)
|
||||
ENDIF(QT3_INCLUDE_DIR)
|
||||
|
||||
FILE(GLOB GLOB_PATHS_LIB /usr/lib/qt-3*/lib/)
|
||||
IF (QT3_MT_REQUIRED)
|
||||
FIND_LIBRARY(QT3_QT_LIBRARY
|
||||
NAMES
|
||||
qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib}
|
||||
qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321 qt-mt3
|
||||
PATHS
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
|
||||
$ENV{QTDIR}/lib
|
||||
${GLOB_PATHS_LIB}
|
||||
/usr/local/qt/lib
|
||||
/usr/lib/qt/lib
|
||||
/usr/lib/qt3/lib
|
||||
/usr/lib/qt3/lib64
|
||||
/usr/share/qt3/lib
|
||||
C:/Progra~1/qt/lib
|
||||
/usr/X11R6/lib
|
||||
)
|
||||
|
||||
ELSE (QT3_MT_REQUIRED)
|
||||
FIND_LIBRARY(QT3_QT_LIBRARY
|
||||
NAMES
|
||||
qt qt-${qt_version_str_lib} qt-edu${qt_version_str_lib}
|
||||
qt-mt qt-mt${qt_version_str_lib} qt-mtnc${qt_version_str_lib}
|
||||
qt-mtedu${qt_version_str_lib} qt-mt230nc qt-mtnc321 qt-mt3
|
||||
PATHS
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
|
||||
$ENV{QTDIR}/lib
|
||||
${GLOB_PATHS_LIB}
|
||||
/usr/local/qt/lib
|
||||
/usr/lib/qt/lib
|
||||
/usr/lib/qt3/lib
|
||||
/usr/lib/qt3/lib64
|
||||
/usr/share/qt3/lib
|
||||
C:/Progra~1/qt/lib
|
||||
/usr/X11R6/lib
|
||||
)
|
||||
ENDIF (QT3_MT_REQUIRED)
|
||||
|
||||
IF(QT3_QT_LIBRARY)
|
||||
ELSE(QT3_QT_LIBRARY)
|
||||
ENDIF(QT3_QT_LIBRARY)
|
||||
|
||||
|
||||
FIND_LIBRARY(QT3_QASSISTANTCLIENT_LIBRARY
|
||||
NAMES qassistantclient
|
||||
PATHS
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
|
||||
$ENV{QTDIR}/lib
|
||||
${GLOB_PATHS_LIB}
|
||||
/usr/local/qt/lib
|
||||
/usr/lib/qt3/lib
|
||||
/usr/lib/qt3/lib64
|
||||
/usr/share/qt3/lib
|
||||
C:/Progra~1/qt/lib
|
||||
/usr/X11R6/lib
|
||||
)
|
||||
|
||||
# qt 3 should prefer QTDIR over the PATH
|
||||
FIND_PROGRAM(QT3_MOC_EXECUTABLE
|
||||
NAMES moc moc-qt3
|
||||
HINTS
|
||||
$ENV{QTDIR}/bin
|
||||
PATHS
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
|
||||
$ENV{QTDIR}/bin
|
||||
${GLOB_PATHS_BIN}
|
||||
/usr/local/qt/bin
|
||||
/usr/lib/qt/bin
|
||||
/usr/lib/qt3/bin
|
||||
/usr/share/qt3/bin
|
||||
C:/Progra~1/qt/bin
|
||||
/usr/X11R6/bin
|
||||
)
|
||||
|
||||
IF(QT3_MOC_EXECUTABLE)
|
||||
SET ( QT3_WRAP_CPP "YES")
|
||||
ELSE(QT3_MOC_EXECUTABLE)
|
||||
ENDIF(QT3_MOC_EXECUTABLE)
|
||||
|
||||
# qt 3 should prefer QTDIR over the PATH
|
||||
FIND_PROGRAM(QT3_UIC_EXECUTABLE uic
|
||||
HINTS
|
||||
$ENV{QTDIR}/bin
|
||||
PATHS
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/include/Qt"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/include/Qt"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/include/Qt"
|
||||
${GLOB_PATHS_BIN}
|
||||
/usr/local/qt/bin
|
||||
/usr/lib/qt/bin
|
||||
/usr/lib/qt3/bin
|
||||
/usr/share/qt3/bin
|
||||
C:/Progra~1/qt/bin
|
||||
/usr/X11R6/bin
|
||||
)
|
||||
|
||||
IF(QT3_UIC_EXECUTABLE)
|
||||
SET ( QT3_WRAP_UI "YES")
|
||||
ELSE(QT3_UIC_EXECUTABLE)
|
||||
ENDIF(QT3_UIC_EXECUTABLE)
|
||||
|
||||
IF (WIN32)
|
||||
FIND_LIBRARY(QT3_QTMAIN_LIBRARY qtmain
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.1;InstallDir]/lib"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.2.0;InstallDir]/lib"
|
||||
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\3.1.0;InstallDir]/lib"
|
||||
"$ENV{ProgramFiles}/qt/lib"
|
||||
$ENV{QTDIR}/lib "C:/Program Files/qt/lib"
|
||||
DOC "This Library is only needed by and included with Qt3 on MSWindows. It should be NOTFOUND, undefined or IGNORE otherwise."
|
||||
)
|
||||
ENDIF (WIN32)
|
||||
|
||||
|
||||
IF (QT3_MIN_VERSION)
|
||||
|
||||
STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" qt_major_vers "${qt_version_str}")
|
||||
STRING(REGEX REPLACE "[0-9]+\\.([0-9]+)\\.[0-9]+" "\\1" qt_minor_vers "${qt_version_str}")
|
||||
STRING(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" qt_patch_vers "${qt_version_str}")
|
||||
|
||||
#now parse the parts of the user given version string into variables
|
||||
STRING(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+$" req_qt_major_vers "${QT3_MIN_VERSION}")
|
||||
IF (NOT req_qt_major_vers)
|
||||
error_message( "Invalid Qt version string given: \"${QT3_MIN_VERSION}\", expected e.g. \"3.1.5\"")
|
||||
ENDIF (NOT req_qt_major_vers)
|
||||
|
||||
STRING(REGEX REPLACE "([0-9]+)\\.[0-9]+\\.[0-9]+" "\\1" req_qt_major_vers "${QT3_MIN_VERSION}")
|
||||
STRING(REGEX REPLACE "[0-9]+\\.([0-9])+\\.[0-9]+" "\\1" req_qt_minor_vers "${QT3_MIN_VERSION}")
|
||||
STRING(REGEX REPLACE "[0-9]+\\.[0-9]+\\.([0-9]+)" "\\1" req_qt_patch_vers "${QT3_MIN_VERSION}")
|
||||
|
||||
# req = "6.5.4", qt = "3.2.1"
|
||||
macro(error_message msg)
|
||||
IF(QT3_REQUIRED)
|
||||
MESSAGE( FATAL_ERROR ${msg})
|
||||
ELSE(QT3_REQUIRED)
|
||||
MESSAGE( STATUS ${msg})
|
||||
ENDIF(QT3_REQUIRED)
|
||||
endmacro(error_message)
|
||||
|
||||
IF (req_qt_major_vers GREATER qt_major_vers) # (6 > 3) ?
|
||||
error_message( "Qt major version not matched (required: ${QT3_MIN_VERSION}, found: ${qt_version_str})") # yes
|
||||
ELSE (req_qt_major_vers GREATER qt_major_vers) # no
|
||||
IF (req_qt_major_vers LESS qt_major_vers) # (6 < 3) ?
|
||||
SET( QT3_VERSION_BIG_ENOUGH "YES" ) # yes
|
||||
ELSE (req_qt_major_vers LESS qt_major_vers) # ( 6==3) ?
|
||||
IF (req_qt_minor_vers GREATER qt_minor_vers) # (5>2) ?
|
||||
error_message( "Qt minor version not matched (required: ${QT3_MIN_VERSION}, found: ${qt_version_str})") # yes
|
||||
ELSE (req_qt_minor_vers GREATER qt_minor_vers) # no
|
||||
IF (req_qt_minor_vers LESS qt_minor_vers) # (5<2) ?
|
||||
SET( QT3_VERSION_BIG_ENOUGH "YES" ) # yes
|
||||
ELSE (req_qt_minor_vers LESS qt_minor_vers) # (5==2)
|
||||
IF (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
|
||||
error_message( "Qt patch level not matched (required: ${QT3_MIN_VERSION}, found: ${qt_version_str})") # yes
|
||||
ELSE (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
|
||||
SET( QT3_VERSION_BIG_ENOUGH "YES" ) # yes
|
||||
ENDIF (req_qt_patch_vers GREATER qt_patch_vers) # (4>1) ?
|
||||
ENDIF (req_qt_minor_vers LESS qt_minor_vers)
|
||||
ENDIF (req_qt_minor_vers GREATER qt_minor_vers)
|
||||
ENDIF (req_qt_major_vers LESS qt_major_vers)
|
||||
ENDIF (req_qt_major_vers GREATER qt_major_vers)
|
||||
ENDIF (QT3_MIN_VERSION)
|
||||
|
||||
# if the include a library are found then we have it
|
||||
IF(QT3_INCLUDE_DIR)
|
||||
IF(QT3_QT_LIBRARY)
|
||||
SET( QT3_FOUND "YES" )
|
||||
ENDIF(QT3_QT_LIBRARY)
|
||||
ENDIF(QT3_INCLUDE_DIR)
|
||||
|
||||
IF(QT3_FOUND)
|
||||
SET( QT3_LIBRARIES ${QT3_LIBRARIES} ${QT3_QT_LIBRARY} )
|
||||
SET( QT3_DEFINITIONS "")
|
||||
|
||||
IF (WIN32 AND NOT CYGWIN)
|
||||
IF (QT3_QTMAIN_LIBRARY)
|
||||
# for version 3
|
||||
SET (QT3_DEFINITIONS -DQT_DLL -DQT_THREAD_SUPPORT -DNO_DEBUG)
|
||||
SET (QT3_LIBRARIES imm32.lib ${QT3_QT_LIBRARY} ${QT3_QTMAIN_LIBRARY} )
|
||||
SET (QT3_LIBRARIES ${QT3_LIBRARIES} winmm wsock32)
|
||||
ELSE (QT3_QTMAIN_LIBRARY)
|
||||
# for version 2
|
||||
SET (QT3_LIBRARIES imm32.lib ws2_32.lib ${QT3_QT_LIBRARY} )
|
||||
ENDIF (QT3_QTMAIN_LIBRARY)
|
||||
ELSE (WIN32 AND NOT CYGWIN)
|
||||
SET (QT3_LIBRARIES ${QT3_QT_LIBRARY} )
|
||||
|
||||
SET (QT3_DEFINITIONS -DQT_SHARED -DQT_NO_DEBUG)
|
||||
IF(QT3_QT_LIBRARY MATCHES "qt-mt")
|
||||
SET (QT3_DEFINITIONS ${QT3_DEFINITIONS} -DQT_THREAD_SUPPORT -D_REENTRANT)
|
||||
ENDIF(QT3_QT_LIBRARY MATCHES "qt-mt")
|
||||
|
||||
ENDIF (WIN32 AND NOT CYGWIN)
|
||||
|
||||
IF (QT3_QASSISTANTCLIENT_LIBRARY)
|
||||
SET (QT3_LIBRARIES ${QT3_QASSISTANTCLIENT_LIBRARY} ${QT3_LIBRARIES})
|
||||
ENDIF (QT3_QASSISTANTCLIENT_LIBRARY)
|
||||
|
||||
# Backwards compatibility for CMake1.4 and 1.2
|
||||
SET (QT3_MOC_EXE ${QT3_MOC_EXECUTABLE} )
|
||||
SET (QT3_UIC_EXE ${QT3_UIC_EXECUTABLE} )
|
||||
# for unix add X11 stuff
|
||||
IF(UNIX)
|
||||
FIND_PACKAGE(X11)
|
||||
IF (X11_FOUND)
|
||||
SET (QT3_LIBRARIES ${QT3_LIBRARIES} ${X11_LIBRARIES})
|
||||
ENDIF (X11_FOUND)
|
||||
IF (CMAKE_DL_LIBS)
|
||||
SET (QT3_LIBRARIES ${QT3_LIBRARIES} ${CMAKE_DL_LIBS})
|
||||
ENDIF (CMAKE_DL_LIBS)
|
||||
ENDIF(UNIX)
|
||||
IF(QT3_QT_LIBRARY MATCHES "qt-mt")
|
||||
FIND_PACKAGE(Threads)
|
||||
SET(QT3_LIBRARIES ${QT3_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
|
||||
ENDIF(QT3_QT_LIBRARY MATCHES "qt-mt")
|
||||
ENDIF(QT3_FOUND)
|
||||
|
||||
EXEC_PROGRAM(${QT3_MOC_EXECUTABLE} ARGS "-v" OUTPUT_VARIABLE QTVERSION_MOC)
|
||||
EXEC_PROGRAM(${QT3_UIC_EXECUTABLE} ARGS "-version" OUTPUT_VARIABLE QTVERSION_UIC)
|
||||
|
||||
SET(_QT3_UIC_VERSION_3 FALSE)
|
||||
IF("${QTVERSION_UIC}" MATCHES ".* 3..*")
|
||||
SET(_QT3_UIC_VERSION_3 TRUE)
|
||||
ENDIF("${QTVERSION_UIC}" MATCHES ".* 3..*")
|
||||
|
||||
SET(_QT3_MOC_VERSION_3 FALSE)
|
||||
IF("${QTVERSION_MOC}" MATCHES ".* 3..*")
|
||||
SET(_QT3_MOC_VERSION_3 TRUE)
|
||||
ENDIF("${QTVERSION_MOC}" MATCHES ".* 3..*")
|
||||
|
||||
SET(QT3_WRAP_CPP FALSE)
|
||||
IF (QT3_MOC_EXECUTABLE)
|
||||
IF(_QT3_MOC_VERSION_3)
|
||||
SET ( QT3_WRAP_CPP TRUE)
|
||||
ENDIF(_QT3_MOC_VERSION_3)
|
||||
ENDIF (QT3_MOC_EXECUTABLE)
|
||||
|
||||
SET(QT3_WRAP_UI FALSE)
|
||||
IF (QT3_UIC_EXECUTABLE)
|
||||
IF(_QT3_UIC_VERSION_3)
|
||||
SET ( QT3_WRAP_UI TRUE)
|
||||
ENDIF(_QT3_UIC_VERSION_3)
|
||||
ENDIF (QT3_UIC_EXECUTABLE)
|
||||
|
||||
MARK_AS_ADVANCED(
|
||||
QT3_INCLUDE_DIR
|
||||
QT3_QT_LIBRARY
|
||||
QT3_QTMAIN_LIBRARY
|
||||
QT3_QASSISTANTCLIENT_LIBRARY
|
||||
QT3_UIC_EXECUTABLE
|
||||
QT3_MOC_EXECUTABLE
|
||||
QT3_WRAP_CPP
|
||||
QT3_WRAP_UI
|
||||
)
|
||||
|
|
@ -27,7 +27,7 @@ MACRO (QT3_GENERATE_MOC infile outfile)
|
|||
GET_FILENAME_COMPONENT(outfile ${outfile} ABSOLUTE)
|
||||
|
||||
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
|
||||
COMMAND ${QT_MOC_EXECUTABLE}
|
||||
COMMAND ${QT3_MOC_EXECUTABLE}
|
||||
# ARGS ${moc_includes} -o ${outfile} ${infile}
|
||||
ARGS -o ${outfile} ${infile}
|
||||
DEPENDS ${infile})
|
||||
|
|
@ -47,7 +47,7 @@ ENDMACRO (QT3_GENERATE_MOC)
|
|||
#
|
||||
# SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cxx)
|
||||
# ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
|
||||
# COMMAND ${QT_MOC_EXECUTABLE}
|
||||
# COMMAND ${QT3_MOC_EXECUTABLE}
|
||||
# ARGS ${moc_includes} -o ${outfile} ${it}
|
||||
# DEPENDS ${it})
|
||||
# SET(${outfiles} ${${outfiles}} ${outfile})
|
||||
|
|
@ -63,7 +63,7 @@ ENDMACRO (QT3_GENERATE_MOC)
|
|||
# GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
|
||||
# SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/ui_${outfile}.h)
|
||||
# ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
|
||||
# COMMAND ${QT_UIC_EXECUTABLE}
|
||||
# COMMAND ${QT3_UIC_EXECUTABLE}
|
||||
# ARGS -o ${outfile} ${infile}
|
||||
# MAIN_DEPENDENCY ${infile})
|
||||
# SET(${outfiles} ${${outfiles}} ${outfile})
|
||||
|
|
@ -89,7 +89,7 @@ MACRO (QT3_ADD_RESOURCES outfiles )
|
|||
SET(_RC_DEPENDS ${_RC_DEPENDS} "${rc_path}/${_RC_FILE}")
|
||||
ENDFOREACH(_RC_FILE)
|
||||
ADD_CUSTOM_COMMAND(OUTPUT ${outfile}
|
||||
COMMAND ${QT_RCC_EXECUTABLE}
|
||||
COMMAND ${QT3_RCC_EXECUTABLE}
|
||||
ARGS -name ${outfilename} -o ${outfile} ${infile}
|
||||
MAIN_DEPENDENCY ${infile}
|
||||
DEPENDS ${_RC_DEPENDS})
|
||||
|
|
@ -154,7 +154,7 @@ MACRO(QT3_AUTOMOC)
|
|||
# MESSAGE(STATUS "QT3_AUTOMOC: add rule ${_moc} <- ${moc_source}") # debug
|
||||
include_directories (BEFORE ${CMAKE_CURRENT_BINARY_DIR})
|
||||
ADD_CUSTOM_COMMAND(OUTPUT ${_moc}
|
||||
COMMAND ${QT_MOC_EXECUTABLE}
|
||||
COMMAND ${QT3_MOC_EXECUTABLE}
|
||||
# ARGS ${_moc_INCS} ${_header} -o ${_moc}
|
||||
${moc_source} -o ${_moc}
|
||||
DEPENDS ${moc_source}
|
||||
|
|
|
|||
|
|
@ -21,10 +21,10 @@ assert(CGAL_BINARY_DIR)
|
|||
find_package(OpenGL)
|
||||
find_package(Qt3)
|
||||
|
||||
if( QT_FOUND AND OPENGL_FOUND )
|
||||
if( QT3_FOUND AND OPENGL_FOUND )
|
||||
|
||||
get_dependency_version(OPENGL OpenGL)
|
||||
get_dependency_version(QT)
|
||||
get_dependency_version(QT3)
|
||||
|
||||
set( CGAL_USE_QT3 TRUE )
|
||||
add_config_flag( CGAL_USE_QT3 )
|
||||
|
|
@ -32,15 +32,15 @@ if( QT_FOUND AND OPENGL_FOUND )
|
|||
message( STATUS "OpenGL include: ${OPENGL_INCLUDE_DIR}" )
|
||||
message( STATUS "OpenGL libraries: ${OPENGL_LIBRARIES}" )
|
||||
message( STATUS "OpenGL definitions: ${OPENGL_DEFINITIONS}" )
|
||||
message( STATUS "Qt3 include: ${QT_INCLUDE_DIR}" )
|
||||
message( STATUS "Qt3 libraries: ${QT_LIBRARIES}" )
|
||||
message( STATUS "Qt3 definitions: ${QT_DEFINITIONS}" )
|
||||
message( STATUS "moc executable: ${QT_MOC_EXECUTABLE}" )
|
||||
message( STATUS "uic executable: ${QT_UIC_EXECUTABLE}" )
|
||||
message( STATUS "Qt3 include: ${QT3_INCLUDE_DIR}" )
|
||||
message( STATUS "Qt3 libraries: ${QT3_LIBRARIES}" )
|
||||
message( STATUS "Qt3 definitions: ${QT3_DEFINITIONS}" )
|
||||
message( STATUS "moc executable: ${QT3_MOC_EXECUTABLE}" )
|
||||
message( STATUS "uic executable: ${QT3_UIC_EXECUTABLE}" )
|
||||
|
||||
cache_set(CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS ${QT_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} )
|
||||
cache_set(CGAL_Qt3_3RD_PARTY_LIBRARIES ${QT_LIBRARIES} ${OPENGL_LIBRARIES} )
|
||||
cache_set(CGAL_Qt3_3RD_PARTY_DEFINITIONS ${QT_DEFINITIONS} ${OPENGL_DEFINITIONS} )
|
||||
cache_set(CGAL_Qt3_3RD_PARTY_INCLUDE_DIRS ${QT3_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR} )
|
||||
cache_set(CGAL_Qt3_3RD_PARTY_LIBRARIES ${QT3_LIBRARIES} ${OPENGL_LIBRARIES} )
|
||||
cache_set(CGAL_Qt3_3RD_PARTY_DEFINITIONS ${QT3_DEFINITIONS} ${OPENGL_DEFINITIONS} )
|
||||
|
||||
include(Qt3Macros)
|
||||
|
||||
|
|
@ -94,7 +94,7 @@ if( QT_FOUND AND OPENGL_FOUND )
|
|||
|
||||
set_target_properties(CGAL_Qt3 PROPERTIES VERSION "${CGAL_SONAME_VERSION}" SOVERSION "${CGAL_SOVERSION}")
|
||||
|
||||
target_link_libraries( CGAL_Qt3 ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_Qt3_3RD_PARTY_LIBRARIES} )
|
||||
target_link_libraries( CGAL_Qt3 ${CGAL_LIBRARY} ${CGAL_3RD_PARTY_LIBRARIES} ${CGAL_Qt3_3RD_PARTY_LIBRARIES} )
|
||||
|
||||
add_definitions ( ${CGAL_3RD_PARTY_DEFINITIONS} ${CGAL_Qt3_3RD_PARTY_DEFINITIONS} )
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue