[gentoo-commits] gentoo-x86 commit in x11-libs/gl2ps/files: gl2ps-1.3.8-cmake.patch

[gentoo-commits] gentoo-x86 commit in x11-libs/gl2ps/files: gl2ps-1.3.8-cmake.patch

[Justin Lecher (jlec)]

jlec        12/12/06 14:08:46

  Added:                gl2ps-1.3.8-cmake.patch
  Log:
  x11-libs/gl2ps: Version Bump
  
  (Portage version: 2.2.0_alpha144/cvs/Linux x86_64, signed Manifest commit with key 70EB7916)

Revision  Changes    Path
1.1                  x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/x11-libs/gl2ps/files/gl2ps-1.3.8-cmake.patch?rev=1.1&content-type=text/plain

Index: gl2ps-1.3.8-cmake.patch
===================================================================
From: Sebastien Fabbro <bicatali@gentoo.org>

Patch to add various enhancements to cmake:
* use GNU standard CMAKE_INSTALL_DOCDIR
* optional documenation building
* optional examples building
* do not install static libraries

--- CMakeLists.txt	2012-09-02 02:07:33.000000000 -0700
+++ CMakeLists.txt	2012-09-17 13:51:58.337832078 -0700
@@ -46,6 +46,8 @@
 
 option(ENABLE_ZLIB "Enable compression using ZLIB" ON)
 option(ENABLE_PNG "Enable PNG support" ON)
+option(ENABLE_DOC "Enable documentation" OFF)
+option(ENABLE_EXAMPLES "Build and install examples" OFF)
 
 set(GL2PS_MAJOR_VERSION 1)
 set(GL2PS_MINOR_VERSION 3)
@@ -103,8 +105,6 @@
 include_directories(${EXTERNAL_INCLUDES})
 
 if(OPENGL_FOUND)
-  add_library(lib STATIC gl2ps.c gl2ps.h)
-  set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
 
   add_library(shared SHARED gl2ps.c gl2ps.h)
   target_link_libraries(shared ${EXTERNAL_LIBRARIES})
@@ -116,29 +116,32 @@
     set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
   endif(MSVC)
 
-  install(TARGETS lib shared DESTINATION lib${LIB_SUFFIX})
+  install(TARGETS shared DESTINATION lib${LIB_SUFFIX})
 endif(OPENGL_FOUND)
 
 if(WIN32)
   set(GL2PS_DOC .)
 else(WIN32)
-  set(GL2PS_DOC share/doc/gl2ps)
+  set(GL2PS_DOC ${CMAKE_INSTALL_DOCDIR})
 endif(WIN32)
 
 install(FILES gl2ps.h DESTINATION include)
 install(FILES ${CMAKE_SOURCE_DIR}/README.txt DESTINATION ${GL2PS_DOC})
-install(FILES ${CMAKE_SOURCE_DIR}/COPYING.LGPL DESTINATION ${GL2PS_DOC})
-install(FILES ${CMAKE_SOURCE_DIR}/COPYING.GL2PS DESTINATION ${GL2PS_DOC})
+install(FILES ${CMAKE_SOURCE_DIR}/TODO.txt DESTINATION ${GL2PS_DOC})
+
+
+if(ENABLE_EXAMPLES)
 install(FILES ${CMAKE_SOURCE_DIR}/gl2psTest.c DESTINATION ${GL2PS_DOC})
 install(FILES ${CMAKE_SOURCE_DIR}/gl2psTestSimple.c DESTINATION ${GL2PS_DOC})
-
 if(GLUT_FOUND)
   add_executable(gl2psTest WIN32 gl2psTest.c)
   target_link_libraries(gl2psTest lib ${EXTERNAL_LIBRARIES})
   add_executable(gl2psTestSimple WIN32 gl2psTestSimple.c)
   target_link_libraries(gl2psTestSimple lib ${EXTERNAL_LIBRARIES})
 endif(GLUT_FOUND)
+endif(ENABLE_EXAMPLES)
 
+if(ENABLE_DOC)
 find_package(LATEX)
 if(PDFLATEX_COMPILER)
   add_custom_command(OUTPUT gl2ps.pdf DEPENDS gl2ps.tex 
@@ -157,6 +160,7 @@
     add_custom_target(html DEPENDS gl2ps.html)
   endif(TTH)
 endif(PDFLATEX_COMPILER)
+endif(ENABLE_DOC)
 
 set(CPACK_PACKAGE_VENDOR "Christophe Geuzaine")
 set(CPACK_PACKAGE_VERSION_MAJOR ${GL2PS_MAJOR_VERSION})