From f3831806e7553e74cd756c189181b6b33f9d76c9 Mon Sep 17 00:00:00 2001 From: Marcel Metz Date: Thu, 10 Mar 2016 11:50:32 +0100 Subject: [PATCH 1/3] Install pdb file for `Debug` and `RelWithDebInfo` --- build/cmake/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index ef1a564..158ef17 100644 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -191,6 +191,14 @@ install(FILES ${GLEW_DIR}/glew.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) +if((NOT MSVC_VERSION LESS 1600) AND (NOT CMAKE_VERSION VERSION_LESS "3.1")) + install( + FILES $ + DESTINATION ${CMAKE_INSTALL_LIBDIR} + CONFIGURATIONS Debug RelWithDebInfo + ) +endif() + install (FILES ${GLEW_DIR}/include/GL/wglew.h ${GLEW_DIR}/include/GL/glew.h From 8047ef41fac61e5ae9e71b53ca0916455031b8bf Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 21 May 2016 07:59:11 +1000 Subject: [PATCH 2/3] parse_xml.py touch-up for Python 3 (or Python 2) --- auto/bin/parse_xml.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/auto/bin/parse_xml.py b/auto/bin/parse_xml.py index a9c1b4b..1340deb 100755 --- a/auto/bin/parse_xml.py +++ b/auto/bin/parse_xml.py @@ -114,8 +114,8 @@ if __name__ == '__main__': dom = parse(i) api = findApi(dom, 'egl') - print 'Found {} enums, {} commands, {} features and {} extensions.'.format( - len(api[0]), len(api[1]), len(api[2]), len(api[3])) + print('Found {} enums, {} commands, {} features and {} extensions.'.format( + len(api[0]), len(api[1]), len(api[2]), len(api[3]))) if len(options.core): for i in api[2].keys(): From 180db268c0d0f9f8719b17a3ff7c6be9d6637f1a Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 21 May 2016 08:07:56 +1000 Subject: [PATCH 3/3] cmake fixup for non-Windows --- build/cmake/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index 158ef17..9130e00 100644 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -191,7 +191,7 @@ install(FILES ${GLEW_DIR}/glew.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ) -if((NOT MSVC_VERSION LESS 1600) AND (NOT CMAKE_VERSION VERSION_LESS "3.1")) +if(WIN32 AND (NOT MSVC_VERSION LESS 1600) AND (NOT CMAKE_VERSION VERSION_LESS "3.1")) install( FILES $ DESTINATION ${CMAKE_INSTALL_LIBDIR}