Commit 180d93a6 authored by Julien Wadel's avatar Julien Wadel
Browse files

Fix a crash when starting a core on an account that don't have a contact address.

Remove SDL checks on OpenLDAP (Windows).
Activate OpenLDAP for UWP.
Rename x64 into Win64 for Windows x64 compressed package.
Showing with 11 additions and 8 deletions
+11 -8
......@@ -6,7 +6,7 @@
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_WINDOWS == null
- if: $CI_PIPELINE_SOURCE == "schedule" && $DOCKER_UPDATE == null && $SKIP_WINDOWS == null
variables:
CMAKE_OPTIONS: -DENABLE_UNIT_TESTS=ON -DENABLE_LDAP=ON
CMAKE_OPTIONS: -DENABLE_UNIT_TESTS=ON
LINPHONESDK_PLATFORM: Desktop
OUTPUT_ZIP_FOLDER: win32
MINGW_TYPE: mingw32
......@@ -123,7 +123,7 @@
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $DOCKER_UPDATE == null && $SKIP_WINDOWS == null && $DEPLOY_RUN_WINDOWS == null
- if: $CI_PIPELINE_SOURCE == "schedule" && $DOCKER_UPDATE == null && $SKIP_WINDOWS == null && $DEPLOY_RUN_WINDOWS == null
variables:
CMAKE_OPTIONS: -DENABLE_UNIT_TESTS=ON -DENABLE_LDAP=ON
CMAKE_OPTIONS: -DENABLE_UNIT_TESTS=ON
MINGW_TYPE: mingw32
LINPHONESDK_PLATFORM: Desktop
CMAKE_GENERATOR: Ninja
......@@ -143,7 +143,7 @@
.windows-vs2017-msvc:
extends: .windows-vs2017
variables:
CMAKE_OPTIONS: -DENABLE_UNIT_TESTS=ON -DENABLE_LDAP=ON
CMAKE_OPTIONS: -DENABLE_UNIT_TESTS=ON
LINPHONESDK_PLATFORM: Desktop
OUTPUT_ZIP_FOLDER: win32
MINGW_TYPE: mingw32
......@@ -182,7 +182,7 @@ vs2017-ninja-win64-windows-pqc:
rules:
- if: $NIGHTLY_MASTER
variables:
CMAKE_OPTIONS: -DENABLE_UNIT_TESTS=ON -DENABLE_LDAP=ON -DENABLE_PQCRYPTO=ON
CMAKE_OPTIONS: -DENABLE_UNIT_TESTS=ON -DENABLE_PQCRYPTO=ON
vs2017-ninja-win32-windows:
extends: .windows-vs2017-ninja
......@@ -276,7 +276,7 @@ vs2017-win32store-scheduled-windows:
- *nuget_deploy_rule
- *nuget_dev_rule
variables:
CMAKE_OPTIONS: -DCMAKE_TOOLCHAIN_FILE=../cmake-builder/toolchains/toolchain-windows-store.cmake -DENABLE_UNIT_TESTS=YES -DENABLE_FFMPEG=YES -DENABLE_OPENH264=YES -DENABLE_NON_FREE_CODECS=YES -DENABLE_LDAP=NO
CMAKE_OPTIONS: -DCMAKE_TOOLCHAIN_FILE=../cmake-builder/toolchains/toolchain-windows-store.cmake -DENABLE_UNIT_TESTS=YES -DENABLE_FFMPEG=YES -DENABLE_OPENH264=YES -DENABLE_NON_FREE_CODECS=YES
OUTPUT_ZIP_FOLDER: win32store
win32-vs2017-novideo-windows:
......
Subproject commit 4bfbb86b99813eba67053dfdd0435eb85406ba7c
Subproject commit 18f0fd93fdf7e04ba0a50fc133b782192d30ecca
......@@ -75,6 +75,9 @@ if(WIN32)
else()
set(PLATFORM_NAME ${CMAKE_GENERATOR_PLATFORM})
endif()
if(PLATFORM_NAME STREQUAL "x64")
set(PLATFORM_NAME "Win64")
endif()
else()
set(_install_command "${PROJECT_SOURCE_DIR}/cmake/dummy.sh")
endif()
......
openldap @ 2bca580b
Subproject commit 20d769b9342d1745be9e93be1c84f3e75ac40af8
Subproject commit 2bca580b6b2ef22c44fbeaeabac6cbdc7c4756e7
Subproject commit db5e32cfda97d84648efa375dbe5e9446fc7b0bb
Subproject commit 4340f57c404269ca07951f63ec69c36b0e0ac7f9
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment