diff options
| author | Alexander Neundorf <neundorf@kde.org> | 2006-04-05 21:23:39 +0000 |
|---|---|---|
| committer | Alexander Neundorf <neundorf@kde.org> | 2006-04-05 21:23:39 +0000 |
| commit | f5ff2b2a995c43f2a62b128ab461ce515fa31ee5 (patch) | |
| tree | fc2e80045a112abc192a6fa26feff07510e8b492 | |
| parent | 82635764bbf799b2bc99178761bd39d420726746 (diff) | |
| download | extra-cmake-modules-f5ff2b2a995c43f2a62b128ab461ce515fa31ee5.tar.gz extra-cmake-modules-f5ff2b2a995c43f2a62b128ab461ce515fa31ee5.tar.bz2 | |
-add the NOGUI keyword to the KDE4_ADD_EXECUTABLE_CALLS()
right now this only affects OS X: without the NOGUI keyword, now application bundles should be created
I will add RPATH handling later.
kdelibs/kabc/: add a dependency of addressee.h to addressee.cpp, this works partly (i.e. it works if none of both exists, but doesn't work if addressee.cpp exists and addressee.h doesn't)
Alex
CCMAIL: kde-buildsystem@kde.org
svn path=/trunk/KDE/kdelibs/; revision=526894
The following changes were in SVN, but were removed from git:
M pics/CMakeLists.txt
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 2 | ||||
| -rw-r--r-- | modules/KDE4Macros.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index 372e4ee2..ba1c0394 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -492,7 +492,7 @@ if (UNIX) set(RPATH_STYLE_MATCHED TRUE) set(CMAKE_SKIP_BUILD_RPATH TRUE) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) - set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}${LIB_INSTALL_DIR} ${QT_LIBRARY_DIR} ) + set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}${LIB_INSTALL_DIR} ${QT_LIBRARY_DIR} ) # building something else than kdelibs/ ? # then add the dir where the kde libraries are installed if (NOT EXISTS ${CMAKE_SOURCE_DIR}/kdecore/kglobal.h) diff --git a/modules/KDE4Macros.cmake b/modules/KDE4Macros.cmake index e9d36fd4..f05d10d3 100644 --- a/modules/KDE4Macros.cmake +++ b/modules/KDE4Macros.cmake @@ -455,7 +455,7 @@ MACRO (KDE4_ADD_EXECUTABLE _target_NAME _first_ARG) # determine additional parameters for add_executable() if (APPLE) -# set(_add_executable_param MACOSX_BUNDLE) + set(_add_executable_param MACOSX_BUNDLE) endif (APPLE) # should this be enabled on windows ? Alex # if (WIN32) |