Skip to content

Commit 61df46a

Browse files
committed
Fix external dependencies
1 parent a81b891 commit 61df46a

File tree

2 files changed

+28
-14
lines changed

2 files changed

+28
-14
lines changed

cmake/external/icu.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ else()
6060
set(ICU_ARCH 64)
6161
endif()
6262
endif()
63-
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
63+
if(CMAKE_BUILD_TYPE STREQUAL Debug)
6464
set(ICU_I18N_LIBRARY ${ICU_SRC}/src/ICU/lib${ICU_ARCH}/icuind.lib)
6565
set(ICU_UC_LIBRARY ${ICU_SRC}/src/ICU/lib${ICU_ARCH}/icuucd.lib)
6666
set(ICU_I18N_DLL ${ICU_SRC}/src/ICU/bin${ICU_ARCH}/icuin76d.dll)

cmake/external/zlib.cmake

Lines changed: 27 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,31 @@
11
#
2-
# Copyright (C) 09/07/2022 VX APPS <sales@vxapps.com>
2+
# Copyright (c) 2022 Florian Becker <fb@vxapps.com> (VX APPS).
3+
# All rights reserved.
34
#
4-
# This document is property of VX APPS. It is strictly prohibited
5-
# to modify, sell or publish it in any way. In case you have access
6-
# to this document, you are obligated to ensure its nondisclosure.
7-
# Noncompliances will be prosecuted.
5+
# Redistribution and use in source and binary forms, with or without
6+
# modification, are permitted provided that the following conditions are met:
87
#
9-
# Diese Datei ist Eigentum der VX APPS. Jegliche Änderung, Verkauf
10-
# oder andere Verbreitung und Veröffentlichung ist strikt untersagt.
11-
# Falls Sie Zugang zu dieser Datei haben, sind Sie verpflichtet,
12-
# alles in Ihrer Macht stehende für deren Geheimhaltung zu tun.
13-
# Zuwiderhandlungen werden strafrechtlich verfolgt.
8+
# 1. Redistributions of source code must retain the above copyright notice, this
9+
# list of conditions and the following disclaimer.
10+
#
11+
# 2. Redistributions in binary form must reproduce the above copyright notice,
12+
# this list of conditions and the following disclaimer in the documentation
13+
# and/or other materials provided with the distribution.
14+
#
15+
# 3. Neither the name of the copyright holder nor the names of its
16+
# contributors may be used to endorse or promote products derived from
17+
# this software without specific prior written permission.
18+
#
19+
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
20+
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
21+
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
22+
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
23+
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
24+
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
25+
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
26+
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
27+
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
28+
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1429
#
1530

1631
include(ExternalProject)
@@ -19,14 +34,14 @@ set(ZLIB_SRC ${CMAKE_BINARY_DIR}/_deps/zlib-src)
1934
set(ZLIB_INSTALL ${CMAKE_BINARY_DIR}/_deps/zlib-install)
2035
if(UNIX)
2136
set(ZLIB_LIBRARY ${ZLIB_INSTALL}/lib/libz.a)
22-
set(ZLIB_OS_ARGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
2337
else()
24-
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
38+
if(CMAKE_BUILD_TYPE STREQUAL Debug)
2539
set(ZLIB_LIBRARY ${ZLIB_INSTALL}/lib/zlibstaticd.lib)
2640
else()
2741
set(ZLIB_LIBRARY ${ZLIB_INSTALL}/lib/zlibstatic.lib)
2842
endif()
2943
endif()
44+
set(ZLIB_OS_ARGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE})
3045
set(ZLIB_INCLUDE_DIR ${ZLIB_INSTALL}/include)
3146

3247
ExternalProject_Add(ZLIB
@@ -44,7 +59,6 @@ ExternalProject_Add(ZLIB
4459
INSTALL_DIR ${ZLIB_INSTALL}
4560
BUILD_BYPRODUCTS ${ZLIB_LIBRARY}
4661
UPDATE_COMMAND ""
47-
PATCH_COMMAND patch -t < ${CMAKE_SOURCE_DIR}/cmake/patches/zlib.patch
4862
)
4963

5064
# We cannot use find_library because ExternalProject_Add() is performed at build time.

0 commit comments

Comments
 (0)