diff options
| -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) |