Skip to content

Commit 5a388c1

Browse files
committed
[futurepress#83] Updates for Windows
1 parent 22ae60b commit 5a388c1

File tree

7 files changed

+10
-6
lines changed

7 files changed

+10
-6
lines changed

CMakeLists.txt

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,11 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
4545
-DCMAKE_C_FLAGS=${CMAKE_C_FLAGS}
4646
-DCMAKE_OSX_ARCHITECTURES=${ESCAPED_ARCHS}
4747
)
48+
# This allows to not sign compiled PCRE2 executables for iOS / macOS builds,
49+
# we don't really use them anyway, but we need them build for the install
50+
# command below to work.
51+
set(EXTRA_INSTALL_ARGS "-- CODE_SIGNING_ALLOWED=NO")
52+
4853
elseif(CMAKE_SYSTEM_NAME MATCHES "iOS")
4954
set(
5055
EXTRA_BUILD_ARGS
@@ -54,6 +59,10 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "iOS")
5459
-DCMAKE_IOS_INSTALL_COMBINED=${CMAKE_IOS_INSTALL_COMBINED}
5560
-GXcode
5661
)
62+
# This allows to not sign compiled PCRE2 executables for iOS / macOS builds,
63+
# we don't really use them anyway, but we need them build for the install
64+
# command below to work.
65+
set(EXTRA_INSTALL_ARGS "-- CODE_SIGNING_ALLOWED=NO")
5766
endif()
5867

5968
if(CMAKE_SYSTEM_NAME MATCHES "Android|Windows")
@@ -73,12 +82,7 @@ execute_process(
7382

7483
execute_process(
7584
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR}/pcre2
76-
--config Release
77-
78-
# This allows to not sign compiled PCRE2 executables for iOS / macOS builds,
79-
# we don't really use them anyway, but we need them build for the install
80-
# command below to work.
81-
-- CODE_SIGNING_ALLOWED=NO
85+
--config Release ${EXTRA_INSTALL_ARGS}
8286
)
8387

8488
execute_process(COMMAND ${CMAKE_COMMAND} --install ${CMAKE_BINARY_DIR}/pcre2)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)