SVN commit 527103 by neundorf: -use the TOOL keyword for kconfig_compiler, genembed and makekdewidgets
ideally the keywords would be: one of RUN_FROM_BUILDTREE, RUN_UNINSTALLED, NOINST, BUILDTOO, TOOL - has to run from the buildtree without being installed NOGUI - bascially means "no bundle on OS X", so e.g. also for maybe kwin default (no keyword): build a bundle on OS X, compile with RPATH to the install dir Alex CCMAIL: [email protected] M +2 -0 cmake/modules/KDE4Macros.cmake M +1 -1 kdecore/kconfig_compiler/CMakeLists.txt M +1 -1 kdewidgets/CMakeLists.txt --- trunk/KDE/kdelibs/cmake/modules/KDE4Macros.cmake #527102:527103 @@ -483,9 +483,11 @@ # and now the RPATH handling... if (${_type} STREQUAL "GUI") +# set_target_properties(${_target_NAME} SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE) endif (${_type} STREQUAL "GUI") if (${_type} STREQUAL "NOGUI") +# set_target_properties(${_target_NAME} SKIP_BUILD_RPATH TRUE BUILD_WITH_INSTALL_RPATH TRUE) endif (${_type} STREQUAL "NOGUI") if (${_type} STREQUAL "TOOL") --- trunk/KDE/kdelibs/kdecore/kconfig_compiler/CMakeLists.txt #527102:527103 @@ -10,7 +10,7 @@ kde4_automoc(${kconfig_compiler_SRCS}) -kde4_add_executable(kconfig_compiler NOGUI ${kconfig_compiler_SRCS}) +kde4_add_executable(kconfig_compiler TOOL ${kconfig_compiler_SRCS}) target_link_libraries(kconfig_compiler ${QT_QTCORE_LIBRARY} ${QT_QTXML_LIBRARY} ) --- trunk/KDE/kdelibs/kdewidgets/CMakeLists.txt #527102:527103 @@ -14,7 +14,7 @@ kde4_automoc(${makekdewidgets_SRCS}) -kde4_add_executable(makekdewidgets NOGUI ${makekdewidgets_SRCS}) +kde4_add_executable(makekdewidgets TOOL ${makekdewidgets_SRCS}) target_link_libraries(makekdewidgets ${KDE4_KDECORE_LIBS} kdecore ) _______________________________________________ Kde-buildsystem mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-buildsystem
