Mercurial > mxe-octave
view src/msvc-gl2ps-1.patch @ 4541:23a905c6f5d3
adapt to wget's new --compression option
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Tue, 21 Nov 2017 22:24:47 -0500 |
parents | 1e9695b83a80 |
children |
line wrap: on
line source
diff -ur gl2ps-1.3.8-source-orig/CMakeLists.txt gl2ps-1.3.8-source/CMakeLists.txt --- gl2ps-1.3.8-source-orig/CMakeLists.txt 2012-11-27 14:41:06 -0500 +++ gl2ps-1.3.8-source/CMakeLists.txt 2013-11-09 15:41:14 -0500 @@ -32,6 +32,9 @@ # Please report all bugs and problems to <gl2ps@geuz.org>. cmake_minimum_required(VERSION 2.4 FATAL_ERROR) +if(COMMAND cmake_policy) + cmake_policy(SET CMP0003 NEW) +endif(COMMAND cmake_policy) # if CMAKE_BUILD_TYPE is specified use it; otherwise set the default # build type to "RelWithDebInfo" ("-O2 -g" with gcc) prior to calling @@ -109,9 +112,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}) set_target_properties(shared PROPERTIES OUTPUT_NAME gl2ps) @@ -122,7 +122,7 @@ set_target_properties(shared PROPERTIES COMPILE_FLAGS "-DGL2PSDLL -DGL2PSDLL_EXPORTS") endif(MSVC) - install(TARGETS lib shared DESTINATION lib${LIB_SUFFIX}) + install(TARGETS shared RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LIB_SUFFIX} ARCHIVE DESTINATION lib${LIB_SUFFIX}) endif(OPENGL_FOUND) set(GL2PS_DOC share/doc/gl2ps) diff -ur gl2ps-1.3.8-source-orig/gl2ps.h gl2ps-1.3.8-source/gl2ps.h --- gl2ps-1.3.8-source-orig/gl2ps.h 2012-11-27 14:41:06 -0500 +++ gl2ps-1.3.8-source/gl2ps.h 2013-11-09 15:38:14 -0500 @@ -41,6 +41,10 @@ /* Define GL2PSDLL at compile time to build a Windows DLL */ +#if defined(_MSC_VER) && !defined(GL2PSDLL) +# define GL2PSDLL +#endif + #if defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(__NT__) # if defined(_MSC_VER) # pragma warning(disable:4115)