We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] windows cmake enhancements

better-windows-cmake.patch (text/plain), 4.76 KB, created by hanetzer on 2018-01-13 10:23:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: hanetzer

Created: 2018-01-13 10:23:11 UTC

Size: 4.76 KB

patch

obsolete

>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index aa5cc0cc6..b3956279a 100644
>--- a/CMakeLists.txt
>+++ b/CMakeLists.txt
>@@ -1600,7 +1600,7 @@ listtostr(EXTRA_CFLAGS _EXTRA_CFLAGS)
> set(EXTRA_CFLAGS ${_EXTRA_CFLAGS})
> 
> # Compat helpers for the configuration files
>-if(NOT WINDOWS OR CYGWIN)
>+if(NOT MSVC)
>   # TODO: we need a Windows script, too
>   execute_process(COMMAND sh ${SDL2_SOURCE_DIR}/build-scripts/updaterev.sh)
> 
>@@ -1726,8 +1726,9 @@ endif()
> if(SDL_STATIC)
>   set (BUILD_SHARED_LIBS FALSE)
>   add_library(SDL2-static STATIC ${SOURCE_FILES})
>-  if (NOT SDL_SHARED OR NOT WIN32)
>-    set_target_properties(SDL2-static PROPERTIES OUTPUT_NAME "SDL2")
>+  set_target_properties(SDL2-static PROPERTIES OUTPUT_NAME "SDL2")
>+  if (MSVC)
>+    set_target_properties(SDL2-static PROPERTIES PREFIX "lib")
>     # Note: Apparently, OUTPUT_NAME must really be unique; even when
>     # CMAKE_IMPORT_LIBRARY_SUFFIX or the like are given. Otherwise
>     # the static build may race with the import lib and one will get
>@@ -1748,17 +1749,17 @@ endif()
> 
> ##### Installation targets #####
> install(TARGETS ${_INSTALL_LIBS} EXPORT SDL2Targets
>-  LIBRARY DESTINATION "lib${LIB_SUFFIX}"
>-  ARCHIVE DESTINATION "lib${LIB_SUFFIX}"
>-  RUNTIME DESTINATION bin)
>+  LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
>+  ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
>+  RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
> 
> ##### Export files #####
> if (APPLE)
>   set(PKG_PREFIX "SDL2.framework/Resources")
>-elseif (WINDOWS)
>+elseif (MSVC)
>   set(PKG_PREFIX "cmake")
> else ()
>-  set(PKG_PREFIX "lib/cmake/SDL2")
>+  set(PKG_PREFIX "${CMAKE_INSTALL_LIBDIR}/cmake/SDL2")
> endif ()
> 
> include(CMakePackageConfigHelpers)
>@@ -1787,28 +1788,28 @@ foreach(_FNAME ${BIN_INCLUDE_FILES})
>   list(REMOVE_ITEM INCLUDE_FILES ${SDL2_SOURCE_DIR}/include/${_INCNAME})
> endforeach()
> list(APPEND INCLUDE_FILES ${BIN_INCLUDE_FILES})
>-install(FILES ${INCLUDE_FILES} DESTINATION include/SDL2)
>+install(FILES ${INCLUDE_FILES} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/SDL2)
> 
>-if(NOT (WINDOWS OR CYGWIN))
>-  if(SDL_SHARED)
>-    if (APPLE)
>-        set(SOEXT "dylib")
>-    else()
>-        set(SOEXT "so")
>-    endif()
>-    install(CODE "
>-      execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
>-      \"libSDL2-2.0.${SOEXT}\" \"libSDL2.${SOEXT}\")")
>-    install(FILES ${SDL2_BINARY_DIR}/libSDL2.${SOEXT} DESTINATION "lib${LIB_SUFFIX}")
>+if(SDL_SHARED AND NOT WINDOWS)
>+  if (APPLE)
>+      set(SOEXT "dylib")
>+  else()
>+      set(SOEXT "so")
>   endif()
>+  install(CODE "
>+    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
>+    \"libSDL2-2.0.${SOEXT}\" \"libSDL2.${SOEXT}\")")
>+  install(FILES ${SDL2_BINARY_DIR}/libSDL2.${SOEXT} DESTINATION ${CMAKE_INSTALL_LIBDIR})
>+endif()
>+if(NOT MSVC)
>   if(FREEBSD)
>     # FreeBSD uses ${PREFIX}/libdata/pkgconfig
>     install(FILES ${SDL2_BINARY_DIR}/sdl2.pc DESTINATION "libdata/pkgconfig")
>   else()
>     install(FILES ${SDL2_BINARY_DIR}/sdl2.pc
>-      DESTINATION "lib${LIB_SUFFIX}/pkgconfig")
>+      DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
>   endif()
>-  install(PROGRAMS ${SDL2_BINARY_DIR}/sdl2-config DESTINATION bin)
>+  install(PROGRAMS ${SDL2_BINARY_DIR}/sdl2-config DESTINATION ${CMAKE_INSTALL_BINDIR})
>   # TODO: what about the .spec file? Is it only needed for RPM creation?
>   install(FILES "${SDL2_SOURCE_DIR}/sdl2.m4" DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/aclocal")
> endif()
>diff --git a/appveyor.yml b/appveyor.yml
>new file mode 100644
>index 000000000..802521c96
>--- /dev/null
>+++ b/appveyor.yml
>@@ -0,0 +1,16 @@
>+version: 2.0.7.{build}
>+
>+image:
>+- Visual Studio 2015
>+
>+build_script:
>+
>+# Visual Studio MSVC
>+- mkdir msvc
>+- cd msvc
>+- cmake ..
>+- cmake --build . --config Release --clean-first
>+- cd ..
>+
>+# 64-bit mingw-w64
>+- C:\cygwin64\bin\sh -c "export PATH=/usr/bin:/usr/local/bin:$PATH && mkdir x86_64 && cd x86_64 && cmake .. -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_TOOLCHAIN_FILE=../cross/x86_64-w64-mingw32.cmake -G'Unix Makefiles' && make VERBOSE=1 -r && cd .."
>diff --git a/cross/x86_64-w64-mingw32.cmake b/cross/x86_64-w64-mingw32.cmake
>new file mode 100644
>index 000000000..7c33ff701
>--- /dev/null
>+++ b/cross/x86_64-w64-mingw32.cmake
>@@ -0,0 +1,17 @@
>+set(CMAKE_SYSTEM_NAME Windows)
>+set(TOOLCHAIN_PREFIX x86_64-w64-mingw32)
>+
>+# cross compilers to use for C, C++ and Fortran
>+set(CMAKE_C_COMPILER x86_64-w64-mingw32-gcc)
>+set(CMAKE_CXX_COMPILER x86_64-w64-mingw32-g++)
>+set(CMAKE_Fortran_COMPILER x86_64-w64-mingw32-gfortran)
>+set(CMAKE_RC_COMPILER x86_64-w64-mingw32-windres)
>+set(PKG_CONFIG_EXECUTABLE x86_64-w64-mingw32-pkg-config)
>+
>+# target environment on the build host system
>+set(CMAKE_FIND_ROOT_PATH /usr/x86_64-w64-mingw32)
>+
>+# modify default behavior of FIND_XXX() commands
>+set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER)
>+set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
>+set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)

Actions: View | Diff

Attachments on bug 4045: 3133 | 3135 | 3136 | 3137 | 3138 | 3140

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.