diff options
| author | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2013-09-07 14:43:17 +0200 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2013-09-07 14:43:17 +0200 |
| commit | 1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba (patch) | |
| tree | 475ec53133c361c13c0a1b1793fd1e00c1e0b3ce /dev-util/cmake/files/cmake-2.8.10-libform.patch | |
| parent | f5837fc796cabbbe572d5b5879eb4ce0aef665b4 (diff) | |
| parent | e1cdc85bc123113b6b9fb4212effda45ef262185 (diff) | |
| download | kde-1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba.tar.gz kde-1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba.tar.bz2 kde-1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/kde
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> |