this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Trying to better handle version numbers and build artifacts.

+30 -10
+5 -6
.appveyor.yml
··· 1 + # If this file isn't being read correctly by Appveyor, make sure the Github connection is correct/reset. 1 2 environment: 2 3 P: "c:/projects/libs" 3 4 ··· 5 6 only: 6 7 - appveyor-prep 7 8 8 - version: 0.11.{build} 9 + version: 0.11.0-{build} 9 10 10 11 image: 11 12 - Visual Studio 2019 ··· 15 16 - echo %APPVEYOR_BUILD_WORKER_IMAGE% 16 17 - if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2019" ( set generator="Visual Studio 16 2019" ) 17 18 - echo %generator% 18 - - set zip_name=SDL_gpu_%APPVEYOR_BUILD_VERSION%-%configuration%-VC-%platform%.zip 19 + - set zip_name=SDL_gpu-%APPVEYOR_BUILD_VERSION%-VS-%platform%-%configuration%.zip 19 20 20 21 21 22 shallow_clone: true ··· 52 53 - cmd: cmake -G %generator% -A %platform% -DCMAKE_INSTALL_PREFIX=c:\projects\libs\SDL2 -DSDL_gpu_BUILD_DEMOS=%build_demos% -DSDL_gpu_BUILD_TESTS=%build_tests% -DSDL_gpu_BUILD_TOOLS=%build_demos% -DSDL_gpu_BUILD_SHARED=ON -DSDL_gpu_BUILD_STATIC=ON .. 53 54 54 55 after_build: 55 - - cd c:\projects\SDL_gpu\build 56 - - cmd: cmake -P cmake_install.cmake 56 + - cd c:\projects\SDL_gpu\build\SDL_gpu-VS 57 + # - cmd: cmake -P cmake_install.cmake 57 58 - 7z a c:\projects\SDL_gpu\%zip_name% * -tzip 58 - - cd c:\projects\libs\SDL2 59 - - 7z a c:\projects\SDL_gpu\install.zip * -tzip 60 59 - cd c:\projects\SDL_gpu 61 60 62 61 artifacts:
+21 -1
CMakeLists.txt
··· 2 2 3 3 project(SDL_gpu) 4 4 5 + file(READ version.txt SDL_GPU_VERSION) 5 6 7 + if((NOT DEFINED VERSION_MAJOR OR NOT DEFINED VERSION_MINOR OR NOT DEFINED VERSION_BUGFIX) AND SDL_GPU_VERSION STREQUAL "") 8 + message(ERROR "Missing version.txt, VERSION_MAJOR, VERSION_MINOR, and VERSION_BUGFIX.") 9 + message(FATAL_ERROR "Failed to read version.txt and cannot proceed without a version number for SDL_gpu.") 10 + endif() 11 + 12 + if(NOT DEFINED VERSION_MAJOR) 13 + string(REGEX MATCH "^[0-9]*" VERSION_MAJOR ${SDL_GPU_VERSION}) 14 + endif() 15 + if(NOT DEFINED VERSION_MINOR) 16 + string(REGEX MATCH "[.][0-9]*[.]" VERSION_MINOR ${SDL_GPU_VERSION}) 17 + # Chop off the dots 18 + string(LENGTH ${VERSION_MINOR} VERSION_MINOR_LENGTH) 19 + string(SUBSTRING ${VERSION_MINOR} 1 ${VERSION_MINOR_LENGTH}-2 VERSION_MINOR) 20 + endif() 21 + if(NOT DEFINED VERSION_BUGFIX) 22 + string(REGEX MATCH "[0-9]*$" VERSION_MAJOR ${SDL_GPU_VERSION}) 23 + endif() 24 + 25 + set(SDL_gpu_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUGFIX}) 6 26 7 27 set(SDL_gpu_INSTALL_BY_DEFAULT ON) 8 28 set(SDL_gpu_DEFAULT_BUILD_SHARED ON) ··· 92 112 option(SDL_gpu_BUILD_SHARED "Build SDL_gpu shared libraries" ${SDL_gpu_DEFAULT_BUILD_SHARED}) 93 113 option(SDL_gpu_BUILD_STATIC "Build SDL_gpu static libraries" ${SDL_gpu_DEFAULT_BUILD_STATIC}) 94 114 95 - set(SDL_gpu_VERSION 0.11.0) 115 + set(SDL_gpu_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_BUGFIX}) 96 116 97 117 if (SDL_gpu_USE_SDL1) 98 118 set(SDL_gpu_LIBRARY SDL_gpu)
+3 -3
src/CMakeLists.txt
··· 76 76 endif(WIN32) 77 77 78 78 if(MSVC) 79 - set(OUTPUT_DIR SDL_gpu-VS-${SDL_gpu_VERSION}) 79 + set(OUTPUT_DIR SDL_gpu-VS) 80 80 elseif(MINGW) 81 - set(OUTPUT_DIR SDL_gpu-MINGW-${SDL_gpu_VERSION}) 81 + set(OUTPUT_DIR SDL_gpu-MINGW) 82 82 else() 83 - set(OUTPUT_DIR SDL_gpu-${SDL_gpu_VERSION}) 83 + set(OUTPUT_DIR SDL_gpu) 84 84 endif() 85 85 86 86 if(APPLE)
+1
version.txt
··· 1 + 0.11.0