/[gentoo-x86]/dev-util/cmake/files/cmake-2.8.1-libform.patch
Gentoo

Contents of /dev-util/cmake/files/cmake-2.8.1-libform.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Tue Apr 13 09:21:44 2010 UTC (4 years, 8 months ago) by scarabeus
Branch: MAIN
Revision bump from overlay. Fix boost issues and bundled libform. Remove old.
(Portage version: 2.2_rc67/cvs/Linux x86_64)

1 diff -u -r cmake-2.8.1.medium/CMakeLists.txt cmake-2.8.1/CMakeLists.txt
2 --- cmake-2.8.1.medium/CMakeLists.txt 2010-03-16 21:29:28.000000000 +0100
3 +++ cmake-2.8.1/CMakeLists.txt 2010-04-04 20:04:47.000000000 +0200
4 @@ -314,9 +314,6 @@
5 ELSE (UNIX)
6 SET(BUILD_CursesDialog 0)
7 ENDIF (UNIX)
8 - IF(BUILD_CursesDialog)
9 - ADD_SUBDIRECTORY(Source/CursesDialog/form)
10 - ENDIF(BUILD_CursesDialog)
11 ENDMACRO (CMAKE_BUILD_UTILITIES)
12
13
14 diff -u -r cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt cmake-2.8.1/Source/CursesDialog/CMakeLists.txt
15 --- cmake-2.8.1.medium/Source/CursesDialog/CMakeLists.txt 2010-03-16 21:29:34.000000000 +0100
16 +++ cmake-2.8.1/Source/CursesDialog/CMakeLists.txt 2010-04-04 20:01:38.000000000 +0200
17 @@ -25,13 +25,18 @@
18 CursesDialog/ccmake
19 )
20
21 -INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form
22 - ${CMake_BINARY_DIR}/Source/CursesDialog/form)
23 INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
24
25
26 ADD_EXECUTABLE(ccmake ${CURSES_SRCS} )
27 TARGET_LINK_LIBRARIES(ccmake CMakeLib)
28 -TARGET_LINK_LIBRARIES(ccmake cmForm)
29 +TARGET_LINK_LIBRARIES(ccmake form)
30 +TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
31 +IF(CURSES_EXTRA_LIBRARY)
32 + TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
33 +ENDIF(CURSES_EXTRA_LIBRARY)
34 +
35
36 INSTALL_TARGETS(/bin ccmake)
37 +
38 +
39 diff -u -r cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h
40 --- cmake-2.8.1.medium/Source/CursesDialog/cmCursesStandardIncludes.h 2010-03-16 21:29:35.000000000 +0100
41 +++ cmake-2.8.1/Source/CursesDialog/cmCursesStandardIncludes.h 2010-04-04 20:01:38.000000000 +0200
42 @@ -15,8 +15,6 @@
43 #define _MSE_INT_H
44 #endif
45
46 -#include <cmFormConfigure.h>
47 -
48 #if defined(__hpux)
49 # define _BOOL_DEFINED
50 # include <sys/time.h>

  ViewVC Help
Powered by ViewVC 1.1.20