Mercurial > mxe-octave

annotate src/msvc-gl2ps-1.patch @ 3338:1e9695b83a80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
imported patch msvc-gl2ps-doc
author Michael Goffioul <michael.goffioul@gmail.com>
date Fri, 29 Nov 2013 18:46:47 -0500
parents 14d0e2102581
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3295
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
1 diff -ur gl2ps-1.3.8-source-orig/CMakeLists.txt gl2ps-1.3.8-source/CMakeLists.txt
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
2 --- gl2ps-1.3.8-source-orig/CMakeLists.txt 2012-11-27 14:41:06 -0500
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
3 +++ gl2ps-1.3.8-source/CMakeLists.txt 2013-11-09 15:41:14 -0500
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
4 @@ -32,6 +32,9 @@
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
5 # Please report all bugs and problems to <gl2ps@geuz.org>.
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
6
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
7 cmake_minimum_required(VERSION 2.4 FATAL_ERROR)
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
8 +if(COMMAND cmake_policy)
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
9 + cmake_policy(SET CMP0003 NEW)
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
10 +endif(COMMAND cmake_policy)
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
11
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
12 # if CMAKE_BUILD_TYPE is specified use it; otherwise set the default
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
13 # build type to "RelWithDebInfo" ("-O2 -g" with gcc) prior to calling
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
14 @@ -109,9 +112,6 @@
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
15 include_directories(${EXTERNAL_INCLUDES})
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
16
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
17 if(OPENGL_FOUND)
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
18 - add_library(lib STATIC gl2ps.c gl2ps.h)
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
19 - set_target_properties(lib PROPERTIES OUTPUT_NAME gl2ps)
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
20 -
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
21 add_library(shared SHARED gl2ps.c gl2ps.h)
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
22 target_link_libraries(shared ${EXTERNAL_LIBRARIES})
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
23 set_target_properties(shared PROPERTIES OUTPUT_NAME gl2ps)
3338
1e9695b83a80 imported patch msvc-gl2ps-doc
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3295
diff changeset
24 @@ -122,7 +122,7 @@
3295
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
25 set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS")
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
26 endif(MSVC)
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
27
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
28 - install(TARGETS lib shared DESTINATION lib${LIB_SUFFIX})
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
29 + install(TARGETS shared RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX})
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
30 endif(OPENGL_FOUND)
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
31
3338
1e9695b83a80 imported patch msvc-gl2ps-doc
Michael Goffioul <michael.goffioul@gmail.com>
parents: 3295
diff changeset
32 set(GL2PS_DOC share/doc/gl2ps)
3295
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
33 diff -ur gl2ps-1.3.8-source-orig/gl2ps.h gl2ps-1.3.8-source/gl2ps.h
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
34 --- gl2ps-1.3.8-source-orig/gl2ps.h 2012-11-27 14:41:06 -0500
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
35 +++ gl2ps-1.3.8-source/gl2ps.h 2013-11-09 15:38:14 -0500
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
36 @@ -41,6 +41,10 @@
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
37
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
38 /* Define GL2PSDLL at compile time to build a Windows DLL */
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
39
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
40 +#if defined(_MSC_VER) && !defined(GL2PSDLL)
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
41 +# define GL2PSDLL
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
42 +#endif
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
43 +
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
44 #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__)
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
45 # if defined(_MSC_VER)
14d0e2102581 [MSVC] Enable gl2ps compilation.
Michael Goffioul <michael.goffioul@gmail.com>
parents:
diff changeset
46 # pragma warning(disable:4115)