@@ -48,7 +48,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Darwin")
48
48
# This allows to not sign compiled PCRE2 executables for iOS / macOS builds,
49
49
# we don't really use them anyway, but we need them build for the install
50
50
# command below to work.
51
- set (EXTRA_INSTALL_ARGS "-- CODE_SIGNING_ALLOWED=NO" )
51
+ set (EXTRA_INSTALL_ARGS "--; CODE_SIGNING_ALLOWED=NO" )
52
52
53
53
elseif (CMAKE_SYSTEM_NAME MATCHES "iOS" )
54
54
set (
@@ -62,7 +62,7 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "iOS")
62
62
# This allows to not sign compiled PCRE2 executables for iOS / macOS builds,
63
63
# we don't really use them anyway, but we need them build for the install
64
64
# command below to work.
65
- set (EXTRA_INSTALL_ARGS "-- CODE_SIGNING_ALLOWED=NO" )
65
+ set (EXTRA_INSTALL_ARGS "--; CODE_SIGNING_ALLOWED=NO" )
66
66
endif ()
67
67
68
68
if (CMAKE_SYSTEM_NAME MATCHES "Android|Windows" )
@@ -103,14 +103,15 @@ endif()
103
103
# Above we have build & installed a local version of PCRE2 library, now we want
104
104
# to enforce Lighttpd build to see and use it (rather than any system-wide
105
105
# installation of another PCRE2 version). On Ubuntu / macOS it can be done
106
- # by setting
107
- #
108
- # set(CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR}/sysroot")
109
- #
110
- # however when building for Windows inside Msys2 / UCRT64 this just has
111
- # no effect for reasons beyond my understanding. Setting PKG_CONFIG_PATH
112
- # environment variable to the folder with PCRE2 .pc file works though.
113
- set (ENV{PKG_CONFIG_PATH} "${CMAKE_BINARY_DIR} /sysroot/lib/pkgconfig" )
106
+ # by setting CMAKE_PREFIX_PATH; somehow it has no effect in Msys2 / UCRT64
107
+ # builds for Windows (beyond by current understanding), but there setting
108
+ # the PKG_CONFIG_PATH environment variable, which is picked up by pkg-config
109
+ # does the trick.
110
+ if (CMAKE_SYSTEM_NAME MATCHES "Windows" )
111
+ set (ENV{PKG_CONFIG_PATH} "${CMAKE_BINARY_DIR} /sysroot/lib/pkgconfig" )
112
+ else ()
113
+ set (CMAKE_PREFIX_PATH "${CMAKE_BINARY_DIR} /sysroot" )
114
+ endif ()
114
115
115
116
add_subdirectory (lighttpd1.4 )
116
117
0 commit comments