diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2012-11-07 00:03:12 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2012-11-07 00:07:39 +1100 |
| commit | b97592c812f879f3bf16261487efff673c58c339 (patch) | |
| tree | e8a763488a7c0d87864a0d4d2b6daceaaa83dec1 /dev-util/cmake/files/cmake-2.8.10-libform.patch | |
| parent | 2fa77a66da06901faa7369771f831a35d3d8f6d9 (diff) | |
| download | kde-b97592c812f879f3bf16261487efff673c58c339.tar.gz kde-b97592c812f879f3bf16261487efff673c58c339.tar.bz2 kde-b97592c812f879f3bf16261487efff673c58c339.zip | |
[dev-util/cmake] Version bump.
Package-Manager: portage-2.1.11.31
Diffstat (limited to 'dev-util/cmake/files/cmake-2.8.10-libform.patch')
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.10-libform.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/dev-util/cmake/files/cmake-2.8.10-libform.patch b/dev-util/cmake/files/cmake-2.8.10-libform.patch new file mode 100644 index 00000000000..052cc30699f --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10-libform.patch @@ -0,0 +1,51 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index ea1c033..ae479ce 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES) + else () + set(BUILD_CursesDialog 0) + endif () +- if(BUILD_CursesDialog) +- add_subdirectory(Source/CursesDialog/form) +- endif() + endmacro () + + #----------------------------------------------------------------------- +diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt +index 96e28b4..4102379 100644 +--- a/Source/CursesDialog/CMakeLists.txt ++++ b/Source/CursesDialog/CMakeLists.txt +@@ -25,13 +25,16 @@ set( CURSES_SRCS + CursesDialog/ccmake + ) + +-include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form +- ${CMake_BINARY_DIR}/Source/CursesDialog/form) + include_directories(${CURSES_INCLUDE_PATH}) + + + add_executable(ccmake ${CURSES_SRCS} ) + target_link_libraries(ccmake CMakeLib) +-target_link_libraries(ccmake cmForm) ++TARGET_LINK_LIBRARIES(ccmake form) ++TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY}) ++IF(CURSES_EXTRA_LIBRARY) ++ TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY}) ++ENDIF(CURSES_EXTRA_LIBRARY) ++ + + install_targets(/bin ccmake) +diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h +index b157a28..f131ea4 100644 +--- a/Source/CursesDialog/cmCursesStandardIncludes.h ++++ b/Source/CursesDialog/cmCursesStandardIncludes.h +@@ -15,8 +15,6 @@ + #define _MSE_INT_H + #endif + +-#include <cmFormConfigure.h> +- + #if defined(__hpux) + # define _BOOL_DEFINED + # include <sys/time.h> |