Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1diff --git a/CMakeLists.txt b/CMakeLists.txt 2index 0342181e9..d6d850a30 100644 3--- a/CMakeLists.txt 4+++ b/CMakeLists.txt 5@@ -818,16 +818,14 @@ endif() 6 if(APPLE) 7 # generating a macOS icns file (see https://stackoverflow.com/a/20703594) 8 add_custom_command(OUTPUT ${PROJECT_SOURCE_DIR}/res/augustus.icns 9- COMMAND mkdir -p augustus.iconset 10- COMMAND sips -z 16 16 augustus_256.png --out augustus.iconset/icon_16x16.png 11- COMMAND sips -z 32 32 augustus_256.png --out augustus.iconset/icon_16x16@2x.png 12- COMMAND sips -z 32 32 augustus_256.png --out augustus.iconset/icon_32x32.png 13- COMMAND sips -z 64 64 augustus_256.png --out augustus.iconset/icon_32x32@2x.png 14- COMMAND sips -z 128 128 augustus_256.png --out augustus.iconset/icon_128x128.png 15- COMMAND sips -z 256 256 augustus_256.png --out augustus.iconset/icon_128x128@2x.png 16- COMMAND sips -z 256 256 augustus_256.png --out augustus.iconset/icon_256x256.png 17- COMMAND sips -z 512 512 augustus_512.png --out augustus.iconset/icon_256x256@2x.png 18- COMMAND iconutil -c icns augustus.iconset 19+ COMMAND mkdir augustus.iconset 20+ COMMAND convert augustus_256.png -resize 16x16 augustus.iconset/icon_16.png 21+ COMMAND convert augustus_256.png -resize 32x32 augustus.iconset/icon_32.png 22+ COMMAND convert augustus_256.png -resize 64x64 augustus.iconset/icon_64.png 23+ COMMAND convert augustus_256.png -resize 128x128 augustus.iconset/icon_128.png 24+ COMMAND cp augustus_256.png augustus.iconset/icon_256.png 25+ COMMAND cp augustus_512.png augustus.iconset/icon_512.png 26+ COMMAND png2icns augustus.icns augustus.iconset/icon_{16,32,64,128,256,512}.png 27 COMMAND rm -R augustus.iconset 28 WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/res) 29 set_source_files_properties(${PROJECT_SOURCE_DIR}/res/augustus.icns PROPERTIES 30diff --git a/cmake/FindSDL2_mixer.cmake b/cmake/FindSDL2_mixer.cmake 31index c3d0b84fe..3e9115dd5 100644 32--- a/cmake/FindSDL2_mixer.cmake 33+++ b/cmake/FindSDL2_mixer.cmake 34@@ -75,7 +75,6 @@ ELSE() 35 PATH_SUFFIXES include include/SDL2 36 PATHS ${SDL2_SEARCH_PATHS} 37 ) 38- set(SDL2_MIXER_INCLUDE_DIR "${SDL2_MIXER_INCLUDE_DIR}/Headers") 39 endif() 40 41 if(NOT APPLE OR NOT EXISTS "${SDL2_MIXER_INCLUDE_DIR}/SDL_mixer.h")