From 793d80f2c4b0d372e61326705f2a8178395c4b81 Mon Sep 17 00:00:00 2001 From: akallabeth Date: Thu, 3 Aug 2023 10:02:19 +0200 Subject: [PATCH] [cmake] update ci defaults --- ci/cmake-preloads/config-android.txt | 2 + ci/cmake-preloads/config-ios.txt | 1 + ci/cmake-preloads/config-macosx.txt | 1 + ci/cmake-preloads/config-windows.txt | 3 + packaging/deb/freerdp-nightly/control | 1 + packaging/flatpak/com.freerdp.FreeRDP.json | 107 +++--------------- .../modules/SDL2-2.28.1-with-libdecor.json | 23 ++++ .../flatpak/modules/SDL2_ttf-2.20.2.json | 22 ++++ packaging/flatpak/modules/cJSON-1.7.16.json | 20 ++++ packaging/flatpak/modules/krb5-1.21.1.json | 12 ++ packaging/flatpak/modules/libusb.json | 19 ++++ packaging/flatpak/modules/pcsc-1.9.9.json | 22 ++++ .../flatpak/modules/pkcs11-helper-1.29.0.json | 22 ++++ packaging/flatpak/modules/xprop-1.2.6.json | 14 +++ packaging/windows/preload.cmake | 3 + rdtk/CMakeLists.txt | 34 +++--- scripts/android-build-freerdp.sh | 1 + uwac/CMakeLists.txt | 28 ++--- winpr/CMakeLists.txt | 26 ++--- 19 files changed, 223 insertions(+), 138 deletions(-) create mode 100644 packaging/flatpak/modules/SDL2-2.28.1-with-libdecor.json create mode 100644 packaging/flatpak/modules/SDL2_ttf-2.20.2.json create mode 100644 packaging/flatpak/modules/cJSON-1.7.16.json create mode 100644 packaging/flatpak/modules/krb5-1.21.1.json create mode 100644 packaging/flatpak/modules/libusb.json create mode 100644 packaging/flatpak/modules/pcsc-1.9.9.json create mode 100644 packaging/flatpak/modules/pkcs11-helper-1.29.0.json create mode 100644 packaging/flatpak/modules/xprop-1.2.6.json diff --git a/ci/cmake-preloads/config-android.txt b/ci/cmake-preloads/config-android.txt index 026ca3830..c3bd2bc71 100644 --- a/ci/cmake-preloads/config-android.txt +++ b/ci/cmake-preloads/config-android.txt @@ -8,3 +8,5 @@ set(FREERDP_EXTERNAL_SSL_PATH $ENV{ANDROID_SSL_PATH} CACHE PATH "android ssl") set (WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "Enable deprecated command line options") set (WITH_KRB5 OFF CACHE BOOL "Kerberos support") set (WITH_CLIENT_SDL OFF CACHE BOOL "SDL client") +set (WITH_SERVER OFF CACHE BOOL "ci default") +set (WITH_X11 OFF CACHE BOOL "ci default") diff --git a/ci/cmake-preloads/config-ios.txt b/ci/cmake-preloads/config-ios.txt index 12a06d03f..848e32b15 100644 --- a/ci/cmake-preloads/config-ios.txt +++ b/ci/cmake-preloads/config-ios.txt @@ -6,5 +6,6 @@ set (CMAKE_OSX_ARCHITECTURES "arm64" CACHE STRING "iOS platform to build") set (CMAKE_OSX_DEPLOYMENT_TARGET "10.0" CACHE STRING "iOS minimum target") set (WITH_SANITIZE_ADDRESS ON CACHE BOOL "build with address sanitizer") set (WITH_CLIENT OFF CACHE BOOL "disable iOS client") +set (WITH_SERVER OFF CACHE BOOL "disable iOS server") set (WITH_KRB5 OFF CACHE BOOL "Kerberos support") set (WITH_CLIENT_SDL OFF CACHE BOOL "SDL client") diff --git a/ci/cmake-preloads/config-macosx.txt b/ci/cmake-preloads/config-macosx.txt index 54f371f5f..edb68a528 100644 --- a/ci/cmake-preloads/config-macosx.txt +++ b/ci/cmake-preloads/config-macosx.txt @@ -10,3 +10,4 @@ set (BUILD_TESTING ON CACHE BOOL "build testing") set (WITH_SANITIZE_ADDRESS ON CACHE BOOL "build with address sanitizer") set (WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "Enable deprecated command line options") set (WITH_KRB5 OFF CACHE BOOL "Kerberos support") +set (WITH_WEBVIEW OFF CACHE BOOL "ci default") diff --git a/ci/cmake-preloads/config-windows.txt b/ci/cmake-preloads/config-windows.txt index 5f8f25a12..84ff6b5c7 100644 --- a/ci/cmake-preloads/config-windows.txt +++ b/ci/cmake-preloads/config-windows.txt @@ -13,4 +13,7 @@ set (WITH_CLIENT_SDL ON CACHE BOOL "build with SDL client") set (WITH_PROXY_MODULES "OFF" CACHE BOOL "Do not build proxy modules") set (CHANNEL_URBDRC OFF CACHE BOOL "USB redirection") set (BUILD_TESTING ON CACHE BOOL "build testing") +set (WITH_FFMPEG OFF CACHE BOOL "ci default") +set (WITH_SWSCALE OFF CACHE BOOL "ci default") +set (WITH_WEBVIEW OFF CACHE BOOL "ci default") set (WITH_FREERDP_DEPRECATED_COMMANDLINE ON CACHE BOOL "Enable deprecated command line options") diff --git a/packaging/deb/freerdp-nightly/control b/packaging/deb/freerdp-nightly/control index dcac9ad7b..1afbec197 100644 --- a/packaging/deb/freerdp-nightly/control +++ b/packaging/deb/freerdp-nightly/control @@ -32,6 +32,7 @@ Build-Depends: libcairo2-dev, libpcsclite-dev, libasound2-dev, + libswscale-dev, libpulse-dev, libavcodec-dev, libavutil-dev, diff --git a/packaging/flatpak/com.freerdp.FreeRDP.json b/packaging/flatpak/com.freerdp.FreeRDP.json index 88d44ccbe..7218b3076 100644 --- a/packaging/flatpak/com.freerdp.FreeRDP.json +++ b/packaging/flatpak/com.freerdp.FreeRDP.json @@ -41,99 +41,14 @@ } }, "modules": [ - { - /** - * libfreerdp use xprop to try to detect keyboard layout - */ - "name": "xprop", - "sources": [ - { - "type": "archive", - "url": "https://xorg.freedesktop.org/releases/individual/app/xprop-1.2.5.tar.bz2", - "sha256": "9b92ed0316bf2486121d8bac88bd1878f16b43bd335f18009b1f941f1eca93a1" - } - ], - "cleanup": [ - "/share/doc", - "/share/man" - ] - }, - { - "name": "libusb", - "config-opts": ["--disable-static"], - "sources": [ - { - "type": "git", - "url": "https://github.com/libusb/libusb.git", - "tag": "v1.0.26" - } - ], - "cleanup": [ - "/share/doc", - "/share/man" - ] - }, - { - "name": "pcsc", - "config-opts": [ - "--disable-libsystemd", - "--enable-pic", - "--disable-libusb", - "--enable-shared", - "--with-systemdsystemunitdir=/app/lib/systemd/" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/LudovicRousseau/PCSC.git", - "tag": "1.9.9" - } - ], - "cleanup": [ - "/share/doc", - "/share/man" - ] - }, - { - "name": "openssl111", - "buildsystem": "simple", - "build-commands": [ - "./config --prefix=/app", - "make -j $FLATPAK_BUILDER_N_JOBS", - "make install_sw" - ], - "cleanup": [ - "/share/doc", - "/share/man", - "/bin" - ], - "sources": [ - { - "type": "archive", - "url": "https://www.openssl.org/source/openssl-1.1.1t.tar.gz", - "sha256": "8dee9b24bdb1dcbf0c3d1e9b02fb8f6bf22165e807f45adeb7c9677536859d3b" - } - ] - }, - { - "name": "cjson", - "buildsystem": "cmake-ninja", - "cleanup": [ - ], - "config-opts": [ - "-DCMAKE_VERBOSE_MAKEFILE=ON", - "-DCMAKE_BUILD_TYPE:STRING=Release", - "-DCMAKE_INSTALL_LIBDIR:PATH=lib", - "-DWITH_PULSE:BOOL=ON" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/DaveGamble/cJSON.git", - "tag": "v1.7.15" - } - ] - }, + "modules/libusb.json", + "modules/SDL2-2.28.1-with-libdecor.json", + "modules/SDL2_ttf-2.20.2.json", + "modules/cJSON-1.7.16.json", + "modules/xprop-1.2.6.json", + "modules/pcsc-1.9.9.json", + "modules/pkcs11-helper-1.29.0.json", + "modules/krb5-1.21.1.json", { "name": "freerdp", "buildsystem": "cmake-ninja", @@ -148,8 +63,11 @@ "-DCHANNEL_URBDRC:BOOL=ON", "-DBUILD_TESTING:BOOL=OFF", "-DWITH_MANPAGES:BOOL=OFF", - "-DWITH_KRB5:BOOL=OFF", + "-DWITH_KRB5:BOOL=ON", "-DWITH_PCSC:BOOL=ON", + "-DWITH_INTERNAL_MD4:BOOL=ON", + "-DWITH_INTERNAL_MD5:BOOL=ON", + "-DWITH_INTERNAL_RC4:BOOL=ON", "-DWITH_PKCS11:BOOL=ON", "-DWITH_SWSCALE:BOOL=ON", "-DWITH_SERVER:BOOL=ON", @@ -158,6 +76,7 @@ "-DWITH_FFMPEG:BOOL=ON", "-DWITH_DSP_FFMPEG:BOOL=ON", "-DWITH_OSS:BOOL=OFF", + "-DWITH_WEBVIEW:BOOL=OFF", "-DWITH_PULSE:BOOL=ON" ], "sources": [ diff --git a/packaging/flatpak/modules/SDL2-2.28.1-with-libdecor.json b/packaging/flatpak/modules/SDL2-2.28.1-with-libdecor.json new file mode 100644 index 000000000..77fa6d015 --- /dev/null +++ b/packaging/flatpak/modules/SDL2-2.28.1-with-libdecor.json @@ -0,0 +1,23 @@ +{ + "name": "SDL2", + "buildsystem": "autotools", + "config-opts": ["--disable-static"], + "sources": [ + { + "type": "archive", + "url": "https://github.com/libsdl-org/SDL/releases/download/release-2.28.1/SDL2-2.28.1.tar.gz", + "sha256": "4977ceba5c0054dbe6c2f114641aced43ce3bf2b41ea64b6a372d6ba129cb15d" + } + ], + "cleanup": [ "/bin/sdl2-config", + "/include", + "/lib/libSDL2.la", + "/lib/libSDL2main.a", + "/lib/libSDL2main.la", + "/lib/libSDL2_test.a", + "/lib/libSDL2_test.la", + "/lib/cmake", + "/share/aclocal", + "/lib/pkgconfig"], + "modules": [ "../shared-modules/libdecor/libdecor-0.1.1.json" ] +} diff --git a/packaging/flatpak/modules/SDL2_ttf-2.20.2.json b/packaging/flatpak/modules/SDL2_ttf-2.20.2.json new file mode 100644 index 000000000..19cb3087f --- /dev/null +++ b/packaging/flatpak/modules/SDL2_ttf-2.20.2.json @@ -0,0 +1,22 @@ +{ + "name": "SDL_ttf", + "config-opts": ["--disable-static"], + "rm-configure": true, + "config-opts": [ + "ac_cv_path_FREETYPE_CONFIG=pkg-config freetype2" + ], + "sources": [ + { + "type": "archive", + "url": "https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.20.2/SDL2_ttf-2.20.2.tar.gz", + "sha256": "9dc71ed93487521b107a2c4a9ca6bf43fb62f6bddd5c26b055e6b91418a22053" + }, + { + "type": "script", + "dest-filename": "autogen.sh", + "commands": [ + "AUTOMAKE=\"automake --foreign\" autoreconf -vfi" + ] + } + ] +} diff --git a/packaging/flatpak/modules/cJSON-1.7.16.json b/packaging/flatpak/modules/cJSON-1.7.16.json new file mode 100644 index 000000000..1c019d5c8 --- /dev/null +++ b/packaging/flatpak/modules/cJSON-1.7.16.json @@ -0,0 +1,20 @@ +{ + "name": "cjson", + "buildsystem": "cmake-ninja", + "cleanup": [ + ], + "config-opts": [ + "-DCMAKE_VERBOSE_MAKEFILE=ON", + "-DCMAKE_BUILD_TYPE:STRING=Release", + "-DCMAKE_INSTALL_LIBDIR:PATH=lib", + "-DWITH_PULSE:BOOL=ON" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/DaveGamble/cJSON.git", + "tag": "v1.7.16", + "commit": "cb8693b058ba302f4829ec6d03f609ac6f848546" + } + ] +} diff --git a/packaging/flatpak/modules/krb5-1.21.1.json b/packaging/flatpak/modules/krb5-1.21.1.json new file mode 100644 index 000000000..3c477051d --- /dev/null +++ b/packaging/flatpak/modules/krb5-1.21.1.json @@ -0,0 +1,12 @@ +{ + "name": "pkcs11-helper", + "buildsystem": "autotools", + "subdir": "src", + "sources": [ + { + "type": "archive", + "url": "https://kerberos.org/dist/krb5/1.21/krb5-1.21.1.tar.gz", + "sha256": "7881c3aaaa1b329bd27dbc6bf2bf1c85c5d0b6c7358aff2b35d513ec2d50fa1f" + } + ] +} diff --git a/packaging/flatpak/modules/libusb.json b/packaging/flatpak/modules/libusb.json new file mode 100644 index 000000000..21dddf80a --- /dev/null +++ b/packaging/flatpak/modules/libusb.json @@ -0,0 +1,19 @@ +{ + "name": "libusb", + "config-opts": [ "--disable-static" ], + "cleanup": [ + "/lib/*.la", + "/lib/pkgconfig", + "/include" + ], + "sources": [ + { + "type": "archive", + "url": "https://github.com/libusb/libusb/releases/download/v1.0.26/libusb-1.0.26.tar.bz2", + "sha256": "12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5" + } + ], + "post-install": [ + "install -Dm644 COPYING /app/share/licenses/libusb/COPYING" + ] +} diff --git a/packaging/flatpak/modules/pcsc-1.9.9.json b/packaging/flatpak/modules/pcsc-1.9.9.json new file mode 100644 index 000000000..2bc71d976 --- /dev/null +++ b/packaging/flatpak/modules/pcsc-1.9.9.json @@ -0,0 +1,22 @@ +{ + "name": "pcsc", + "config-opts": [ + "--disable-libsystemd", + "--enable-pic", + "--disable-libusb", + "--enable-shared", + "--with-systemdsystemunitdir=/app/lib/systemd/" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/LudovicRousseau/PCSC.git", + "tag": "1.9.9", + "commit": "15c16c7796607b1c8a2ce253d3f536918ab26b4a" + } + ], + "cleanup": [ + "/share/doc", + "/share/man" + ] +} diff --git a/packaging/flatpak/modules/pkcs11-helper-1.29.0.json b/packaging/flatpak/modules/pkcs11-helper-1.29.0.json new file mode 100644 index 000000000..9a0dba747 --- /dev/null +++ b/packaging/flatpak/modules/pkcs11-helper-1.29.0.json @@ -0,0 +1,22 @@ +{ + "name": "pkcs11-helper", + "buildsystem": "autotools", + "cleanup": [ + ], + "config-opts": [ + ], + "sources": [ + { + "type": "archive", + "url": "https://github.com/OpenSC/pkcs11-helper/archive/refs/tags/pkcs11-helper-1.29.0.tar.gz", + "sha256": "f87c4ce596ccf6211c0de34923e2977c8892bd773ace75d1261a1908979fc9e8" + }, + { + "type": "script", + "dest-filename": "autogen.sh", + "commands": [ + "autoreconf -vfi" + ] + } + ] +} diff --git a/packaging/flatpak/modules/xprop-1.2.6.json b/packaging/flatpak/modules/xprop-1.2.6.json new file mode 100644 index 000000000..0da60126e --- /dev/null +++ b/packaging/flatpak/modules/xprop-1.2.6.json @@ -0,0 +1,14 @@ +{ + "name": "xprop", + "sources": [ + { + "type": "archive", + "url": "https://xorg.freedesktop.org/releases/individual/app/xprop-1.2.6.tar.xz", + "sha256": "580b8525b12ecc0144aa16c88b0aafa76d2e799b44c8c6c50f9ce92788b5586e" + } + ], + "cleanup": [ + "/share/doc", + "/share/man" + ] +} diff --git a/packaging/windows/preload.cmake b/packaging/windows/preload.cmake index b8a8ccf61..1c4816af4 100644 --- a/packaging/windows/preload.cmake +++ b/packaging/windows/preload.cmake @@ -13,3 +13,6 @@ set (WITH_PLATFORM_SERVER OFF CACHE BOOL "Do not build platform server") set (WITH_INTERNAL_MD4 ON CACHE BOOL "nightly default") set (WITH_INTERNAL_MD5 ON CACHE BOOL "nightly default") set (WITH_INTERNAL_RC4 ON CACHE BOOL "nightly default") +set (WITH_FFMPEG OFF CACHE BOOL "nightly default") +set (WITH_SWSCALE OFF CACHE BOOL "nightly default") +set (WITH_WEBVIEW OFF CACHE BOOL "nightly default") diff --git a/rdtk/CMakeLists.txt b/rdtk/CMakeLists.txt index ce5207e37..ade385d2a 100644 --- a/rdtk/CMakeLists.txt +++ b/rdtk/CMakeLists.txt @@ -31,11 +31,11 @@ if (NOT FREERDP_UNIFIED_BUILD) set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_C_EXTENSIONS ON) - include(CheckIPOSupported) - check_ipo_supported(RESULT supported OUTPUT error) - if (supported) - set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) - endif() + include(CheckIPOSupported) + check_ipo_supported(RESULT supported OUTPUT error) + if (supported) + set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) + endif() option(CMAKE_COLOR_MAKEFILE "colorful CMake makefile" ON) @@ -48,17 +48,17 @@ if (NOT FREERDP_UNIFIED_BUILD) option(BUILD_TESTING "Build library unit tests" ON) option(WITH_LIBRARY_VERSIONING "Use library version triplet" ON) - # Default to release build type - if(NOT CMAKE_BUILD_TYPE) - set(CMAKE_BUILD_TYPE "Release" CACHE STRING "project default" FORCE) - endif() + # Default to release build type + if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Release" CACHE STRING "project default" FORCE) + endif() - if(CMAKE_COMPILER_IS_GNUCC) - if(NOT EXPORT_ALL_SYMBOLS) - message(STATUS "GCC default symbol visibility: hidden") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") - endif() - endif() + if(CMAKE_COMPILER_IS_GNUCC) + if(NOT EXPORT_ALL_SYMBOLS) + message(STATUS "GCC default symbol visibility: hidden") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") + endif() + endif() else() set(WINPR_VERSION_MAJOR ${FREERDP_VERSION_MAJOR}) endif() @@ -84,8 +84,8 @@ include (SetFreeRDPCMakeInstallDir) add_definitions(-DRDTK_EXPORTS) if (NOT IOS) - check_include_files(stdbool.h RDTK_HAVE_STDBOOL_H) - if (NOT RDTK_HAVE_STDBOOL_H) + check_include_files(stdbool.h RDTK_HAVE_STDBOOL_H) + if (NOT RDTK_HAVE_STDBOOL_H) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../compat/stdbool) endif() endif() diff --git a/scripts/android-build-freerdp.sh b/scripts/android-build-freerdp.sh index d2e324e33..c63ff093f 100755 --- a/scripts/android-build-freerdp.sh +++ b/scripts/android-build-freerdp.sh @@ -107,6 +107,7 @@ CMAKE_CMD_ARGS="-DANDROID_NDK=$ANDROID_NDK \ -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \ -DFREERDP_EXTERNAL_PATH=$BUILD_DST \ -DWITH_CLIENT_SDL=OFF \ + -DWITH_SERVER=OFF \ -DCMAKE_MAKE_PROGRAM=make" BASE=$(pwd) diff --git a/uwac/CMakeLists.txt b/uwac/CMakeLists.txt index 42e7028b6..4f82b6b74 100644 --- a/uwac/CMakeLists.txt +++ b/uwac/CMakeLists.txt @@ -31,27 +31,27 @@ if (NOT FREERDP_UNIFIED_BUILD) set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_C_EXTENSIONS ON) - include(CheckIPOSupported) - check_ipo_supported(RESULT supported OUTPUT error) - if (supported) - set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) - endif() + include(CheckIPOSupported) + check_ipo_supported(RESULT supported OUTPUT error) + if (supported) + set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) + endif() option(CMAKE_COLOR_MAKEFILE "colorful CMake makefile" ON) option(CMAKE_VERBOSE_MAKEFILE "verbose CMake makefile" ON) option(CMAKE_POSITION_INDEPENDENT_CODE "build with position independent code (-fPIC or -fPIE)" ON) option(BUILD_SHARED_LIBS "Build shared libraries" ON) - option(EXPORT_ALL_SYMBOLS "Export all symbols form library" OFF) + option(EXPORT_ALL_SYMBOLS "Export all symbols form library" OFF) option(BUILD_TESTING "Build library unit tests" ON) option(WITH_LIBRARY_VERSIONING "Use library version triplet" ON) - if(CMAKE_COMPILER_IS_GNUCC) - if(NOT EXPORT_ALL_SYMBOLS) - message(STATUS "GCC default symbol visibility: hidden") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") - endif() - endif() + if(CMAKE_COMPILER_IS_GNUCC) + if(NOT EXPORT_ALL_SYMBOLS) + message(STATUS "GCC default symbol visibility: hidden") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fvisibility=hidden") + endif() + endif() endif() option(UWAC_HAVE_PIXMAN_REGION "Use PIXMAN or FreeRDP for region calculations" "NOT FREERDP_UNIFIED_BUILD") @@ -71,8 +71,8 @@ endif() if (NOT IOS) include(CheckIncludeFiles) - check_include_files(stdbool.h UWAC_HAVE_STDBOOL_H) - if (NOT UWAC_HAVE_STDBOOL_H) + check_include_files(stdbool.h UWAC_HAVE_STDBOOL_H) + if (NOT UWAC_HAVE_STDBOOL_H) include_directories(BEFORE ${CMAKE_CURRENT_SOURCE_DIR}/../compat/stdbool) endif() endif() diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt index cdd843ef0..968285400 100644 --- a/winpr/CMakeLists.txt +++ b/winpr/CMakeLists.txt @@ -23,15 +23,15 @@ if (NOT FREERDP_UNIFIED_BUILD) set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_C_EXTENSIONS ON) - include(CheckIPOSupported) - check_ipo_supported(RESULT supported OUTPUT error) - if (supported) - set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) - endif() + include(CheckIPOSupported) + check_ipo_supported(RESULT supported OUTPUT error) + if (supported) + set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) + endif() - option(CMAKE_COLOR_MAKEFILE "colorful CMake makefile" ON) - option(CMAKE_VERBOSE_MAKEFILE "verbose CMake makefile" ON) - option(CMAKE_POSITION_INDEPENDENT_CODE "build with position independent code (-fPIC or -fPIE)" ON) + option(CMAKE_COLOR_MAKEFILE "colorful CMake makefile" ON) + option(CMAKE_VERBOSE_MAKEFILE "verbose CMake makefile" ON) + option(CMAKE_POSITION_INDEPENDENT_CODE "build with position independent code (-fPIC or -fPIE)" ON) option(WITH_LIBRARY_VERSIONING "Use library version triplet" ON) # Default to build shared libs @@ -165,13 +165,13 @@ if(NOT IOS) set(WINPR_HAVE_EXECINFO_H ON) endif() endif() - check_include_files(inttypes.h WINPR_HAVE_INTTYPES_H) + check_include_files(inttypes.h WINPR_HAVE_INTTYPES_H) check_include_files(stdint.h WINPR_HAVE_STDINT_H) - check_include_files(inttypes.h WINPR_HAVE_INTTYPES_H) + check_include_files(inttypes.h WINPR_HAVE_INTTYPES_H) else(NOT IOS) set(WINPR_HAVE_STDINT_H 1) set(WINPR_HAVE_STRNDUP 1) - set(WINPR_HAVE_INTTYPES_H 1) + set(WINPR_HAVE_INTTYPES_H 1) endif(NOT IOS) if (NOT IOS) @@ -195,7 +195,7 @@ if(NOT IOS) check_include_files(aio.h WINPR_HAVE_AIO_H) check_include_files(sys/timerfd.h WINPR_HAVE_SYS_TIMERFD_H) check_include_files(unistd.h WINPR_HAVE_UNISTD_H) - check_include_files(inttypes.h WINPR_HAVE_INTTYPES_H) + check_include_files(inttypes.h WINPR_HAVE_INTTYPES_H) check_include_files(sys/filio.h WINPR_HAVE_SYS_FILIO_H) check_include_files(sys/sockio.h WINPR_HAVE_SYS_SOCKIO_H) check_include_files(syslog.h WINPR_HAVE_SYSLOG_H) @@ -213,7 +213,7 @@ if(NOT IOS) else() set(WINPR_HAVE_FCNTL_H 1) set(WINPR_HAVE_UNISTD_H 1) - set(WINPR_HAVE_INTTYPES_H 1) + set(WINPR_HAVE_INTTYPES_H 1) set(WINPR_HAVE_SYS_FILIO_H 1) set(WINPR_HAVE_TM_GMTOFF 1) endif()