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

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

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download)
Sun Nov 18 13:40:15 2012 UTC (20 months ago) by kensington
Branch: MAIN
CVS Tags: HEAD
Version bump, remove old.

(Portage version: 2.1.11.31/cvs/Linux x86_64, signed Manifest commit with key 675D0D2C)

1 diff --git a/CMakeLists.txt b/CMakeLists.txt
2 index ea1c033..ae479ce 100644
3 --- a/CMakeLists.txt
4 +++ b/CMakeLists.txt
5 @@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES)
6 else ()
7 set(BUILD_CursesDialog 0)
8 endif ()
9 - if(BUILD_CursesDialog)
10 - add_subdirectory(Source/CursesDialog/form)
11 - endif()
12 endmacro ()
13
14 #-----------------------------------------------------------------------
15 diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
16 index 96e28b4..4102379 100644
17 --- a/Source/CursesDialog/CMakeLists.txt
18 +++ b/Source/CursesDialog/CMakeLists.txt
19 @@ -25,13 +25,16 @@ set( CURSES_SRCS
20 CursesDialog/ccmake
21 )
22
23 -include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form
24 - ${CMake_BINARY_DIR}/Source/CursesDialog/form)
25 include_directories(${CURSES_INCLUDE_PATH})
26
27
28 add_executable(ccmake ${CURSES_SRCS} )
29 target_link_libraries(ccmake CMakeLib)
30 -target_link_libraries(ccmake cmForm)
31 +TARGET_LINK_LIBRARIES(ccmake form)
32 +TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
33 +IF(CURSES_EXTRA_LIBRARY)
34 + TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
35 +ENDIF(CURSES_EXTRA_LIBRARY)
36 +
37
38 install_targets(/bin ccmake)
39 diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
40 index b157a28..f131ea4 100644
41 --- a/Source/CursesDialog/cmCursesStandardIncludes.h
42 +++ b/Source/CursesDialog/cmCursesStandardIncludes.h
43 @@ -15,8 +15,6 @@
44 #define _MSE_INT_H
45 #endif
46
47 -#include <cmFormConfigure.h>
48 -
49 #if defined(__hpux)
50 # define _BOOL_DEFINED
51 # include <sys/time.h>

  ViewVC Help
Powered by ViewVC 1.1.20