mirror of https://github.com/CGAL/cgal
Fix conditionnal compilation. Do not compile Qt3 demos if CGAL_Qt3 is not found.
This commit is contained in:
parent
16992fa683
commit
b861e82892
|
|
@ -19,7 +19,7 @@ find_package(Qt3-patched)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
# use the Qt MOC preprocessor on classes that derives from QObject
|
# use the Qt MOC preprocessor on classes that derives from QObject
|
||||||
include( Qt3Macros-patched )
|
include( Qt3Macros-patched )
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ find_package(Qt3-patched)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
# use the Qt MOC preprocessor on classes that derives from QObject
|
# use the Qt MOC preprocessor on classes that derives from QObject
|
||||||
include( Qt3Macros-patched )
|
include( Qt3Macros-patched )
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ find_package(Qt3-patched)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
# use the Qt MOC preprocessor on classes that derives from QObject
|
# use the Qt MOC preprocessor on classes that derives from QObject
|
||||||
include( Qt3Macros-patched )
|
include( Qt3Macros-patched )
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ find_package(Qt3-patched)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
# use the Qt MOC preprocessor on classes that derives from QObject
|
# use the Qt MOC preprocessor on classes that derives from QObject
|
||||||
include( Qt3Macros-patched )
|
include( Qt3Macros-patched )
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ find_package(Qt3-patched)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
# use the Qt MOC preprocessor on classes that derives from QObject
|
# use the Qt MOC preprocessor on classes that derives from QObject
|
||||||
include( Qt3Macros-patched )
|
include( Qt3Macros-patched )
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ find_package(Qt3-patched)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
# use the Qt MOC preprocessor on classes that derives from QObject
|
# use the Qt MOC preprocessor on classes that derives from QObject
|
||||||
include( Qt3Macros-patched )
|
include( Qt3Macros-patched )
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ find_package(Qt3-patched)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
# use the Qt MOC preprocessor on classes that derives from QObject
|
# use the Qt MOC preprocessor on classes that derives from QObject
|
||||||
include( Qt3Macros-patched )
|
include( Qt3Macros-patched )
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ find_package(Qt3-patched)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
# use the Qt MOC preprocessor on classes that derives from QObject
|
# use the Qt MOC preprocessor on classes that derives from QObject
|
||||||
include( Qt3Macros-patched )
|
include( Qt3Macros-patched )
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ find_package(Qt3-patched)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
# use the Qt MOC preprocessor on classes that derives from QObject
|
# use the Qt MOC preprocessor on classes that derives from QObject
|
||||||
include( Qt3Macros-patched )
|
include( Qt3Macros-patched )
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ find_package(Qt3-patched)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
# use the Qt MOC preprocessor on classes that derives from QObject
|
# use the Qt MOC preprocessor on classes that derives from QObject
|
||||||
include( Qt3Macros-patched )
|
include( Qt3Macros-patched )
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ find_package(Qt3-patched)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
|
|
||||||
INCLUDE_DIRECTORIES ( BEFORE ./include )
|
INCLUDE_DIRECTORIES ( BEFORE ./include )
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ find_package(Qt3-patched QUIET)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
|
|
||||||
# The executable itself.
|
# The executable itself.
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ find_package(Qt3-patched)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
include_directories (BEFORE ./include)
|
include_directories (BEFORE ./include)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ find_package(Qt3-patched)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
# use the Qt MOC preprocessor on classes that derives from QObject
|
# use the Qt MOC preprocessor on classes that derives from QObject
|
||||||
include( Qt3Macros-patched )
|
include( Qt3Macros-patched )
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ find_package(Qt3-patched)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
# use the Qt MOC preprocessor on classes that derives from QObject
|
# use the Qt MOC preprocessor on classes that derives from QObject
|
||||||
include( Qt3Macros-patched )
|
include( Qt3Macros-patched )
|
||||||
|
|
|
||||||
|
|
@ -18,7 +18,7 @@ find_package(Qt3-patched)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
# use the Qt MOC preprocessor on classes that derives from QObject
|
# use the Qt MOC preprocessor on classes that derives from QObject
|
||||||
include( Qt3Macros-patched )
|
include( Qt3Macros-patched )
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ find_package(Qt3-patched)
|
||||||
|
|
||||||
find_package(OpenGL)
|
find_package(OpenGL)
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND AND OPENGL_FOUND)
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND AND OPENGL_FOUND)
|
||||||
|
|
||||||
# use the Qt MOC preprocessor on classes that derives from QObject
|
# use the Qt MOC preprocessor on classes that derives from QObject
|
||||||
include( Qt3Macros-patched )
|
include( Qt3Macros-patched )
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ find_package(Qt3-patched)
|
||||||
# that it can be used together with FindQt4: all its variables are prefixed
|
# that it can be used together with FindQt4: all its variables are prefixed
|
||||||
# by "QT3_" instead of "QT_".
|
# by "QT3_" instead of "QT_".
|
||||||
|
|
||||||
if ( CGAL_FOUND AND QT3_FOUND )
|
if ( CGAL_FOUND AND CGAL_Qt3_FOUND AND QT3_FOUND )
|
||||||
|
|
||||||
# use the Qt MOC preprocessor on classes that derives from QObject
|
# use the Qt MOC preprocessor on classes that derives from QObject
|
||||||
include( Qt3Macros-patched )
|
include( Qt3Macros-patched )
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue