diff options
| author | Benjamin Reed <ranger@befunk.com> | 2007-02-26 19:38:58 +0000 |
|---|---|---|
| committer | Benjamin Reed <ranger@befunk.com> | 2007-02-26 19:38:58 +0000 |
| commit | 0dc49c780de91a883efd0c8798cebf0f489634ec (patch) | |
| tree | 5e8badba87f5f529304c2fb0e75aeec7b789b284 | |
| parent | acbefba7a800dddffd27f46ca56dac86cd158015 (diff) | |
| download | extra-cmake-modules-0dc49c780de91a883efd0c8798cebf0f489634ec.tar.gz extra-cmake-modules-0dc49c780de91a883efd0c8798cebf0f489634ec.tar.bz2 | |
There are a couple of places where we make "APPLE" assumptions
when they really should be Q_WS_X11/Q_WS_MAC assumptions.
These changes make it so that kdelibs (and probably the rest)
build against qt4/x11 on Mac OS X safely. It should still work
with qt4/mac as well.
svn path=/trunk/KDE/kdelibs/; revision=637547
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 5 | ||||
| -rw-r--r-- | modules/KDE4Macros.cmake | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 78a4d507..e4e77bcc 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -590,13 +590,12 @@ if (UNIX) endif (UNIX) -# UNIX, except OS X -if (UNIX AND NOT APPLE) +if (Q_WS_X11) # Done by FindQt4.cmake already #find_package(X11 REQUIRED) # UNIX has already set _KDE4_PLATFORM_INCLUDE_DIRS, so append set(_KDE4_PLATFORM_INCLUDE_DIRS ${_KDE4_PLATFORM_INCLUDE_DIRS} ${X11_INCLUDE_DIR} ) -endif (UNIX AND NOT APPLE) +endif (Q_WS_X11) # This will need to be modified later to support either Qt/X11 or Qt/Mac builds diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index f9955a17..2f2479b5 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -766,9 +766,9 @@ macro (KDE4_ADD_EXECUTABLE _target_NAME) # determine additional parameters for add_executable() # for GUI apps, create a bundle on OSX - if (APPLE) + if (Q_WS_MAC) set(_add_executable_param MACOSX_BUNDLE) - endif (APPLE) + endif (Q_WS_MAC) # for GUI apps, this disables the additional console under Windows if (WIN32) |