Gentoo Archives: gentoo-commits

From: "Sebastien Fabbro (bicatali)" <bicatali@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in x11-libs/gl2ps/files: gl2ps-1.3.6-CMakeLists.patch
Date: Sun, 27 Nov 2011 05:33:57
Message-Id: 20111127053345.547A52004C@flycatcher.gentoo.org
1 bicatali 11/11/27 05:33:45
2
3 Added: gl2ps-1.3.6-CMakeLists.patch
4 Log:
5 Version bump
6
7 (Portage version: 2.1.10.37/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 x11-libs/gl2ps/files/gl2ps-1.3.6-CMakeLists.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gl2ps/files/gl2ps-1.3.6-CMakeLists.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gl2ps/files/gl2ps-1.3.6-CMakeLists.patch?rev=1.1&content-type=text/plain
14
15 Index: gl2ps-1.3.6-CMakeLists.patch
16 ===================================================================
17 --- CMakeLists.txt.orig 2011-08-14 18:15:31.000000000 +0100
18 +++ CMakeLists.txt 2011-11-27 05:25:50.000000000 +0000
19 @@ -46,6 +46,7 @@
20
21 option(ENABLE_ZLIB "Enable compression using ZLIB" ON)
22 option(ENABLE_PNG "Enable PNG support" ON)
23 +option(ENABLE_DOC "Enable documentation" OFF)
24
25 set(GL2PS_MAJOR_VERSION 1)
26 set(GL2PS_MINOR_VERSION 3)
27 @@ -103,8 +104,6 @@
28 include_directories(${EXTERNAL_INCLUDES})
29
30 if(OPENGL_FOUND)
31 - add_library(lib STATIC gl2ps.c gl2ps.h)
32 - set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
33
34 add_library(shared SHARED gl2ps.c gl2ps.h)
35 target_link_libraries(shared ${EXTERNAL_LIBRARIES})
36 @@ -116,29 +115,22 @@
37 set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
38 endif(MSVC)
39
40 - install(TARGETS lib shared DESTINATION lib)
41 + install(TARGETS shared DESTINATION lib${LIB_SUFFIX})
42 endif(OPENGL_FOUND)
43
44 if(WIN32)
45 set(GL2PS_DOC .)
46 else(WIN32)
47 - set(GL2PS_DOC share/doc/gl2ps)
48 + set(GL2PS_DOC share/doc/gl2ps-${GL2PS_VERSION})
49 endif(WIN32)
50
51 install(FILES gl2ps.h DESTINATION include)
52 install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC})
53 -install(FILES ${CMAKE_SOURCE_DIR}/COPYING.LGPL DESTINATION ${GL2PS_DOC})
54 -install(FILES ${CMAKE_SOURCE_DIR}/COPYING.GL2PS DESTINATION ${GL2PS_DOC})
55 install(FILES ${CMAKE_SOURCE_DIR}/gl2psTest.c DESTINATION ${GL2PS_DOC})
56 +install(FILES ${CMAKE_SOURCE_DIR}/TODO.txt DESTINATION ${GL2PS_DOC})
57 install(FILES ${CMAKE_SOURCE_DIR}/gl2psTestSimple.c DESTINATION ${GL2PS_DOC})
58
59 -if(GLUT_FOUND)
60 - add_executable(gl2psTest WIN32 gl2psTest.c)
61 - target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
62 - add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
63 - target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
64 -endif(GLUT_FOUND)
65 -
66 +if(ENABLE_DOC)
67 find_package(LATEX)
68 if(PDFLATEX_COMPILER)
69 add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex
70 @@ -157,6 +149,7 @@
71 add_custom_target(html DEPENDS gl2ps.html)
72 endif(TTH)
73 endif(PDFLATEX_COMPILER)
74 +endif(ENABLE_DOC)
75
76 set(CPACK_PACKAGE_VENDOR "Christophe Geuzaine")
77 set(CPACK_PACKAGE_VERSION_MAJOR ${GL2PS_MAJOR_VERSION})