Skip to content

Commit 0aae3d1

Browse files
committed
Pass CMAKE_TOOLCHAIN_FILE to the ExternalProject_Add() CMAKE_ARGS
1 parent 6228938 commit 0aae3d1

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ if (WPCP_BUILD_LIBWEBSOCKETS)
6767
libwebsockets
6868
GIT_REPOSITORY git://git.libwebsockets.org/libwebsockets
6969
GIT_TAG "v2.0.3"
70-
CMAKE_ARGS "-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}" "-DCMAKE_C_FLAGS:STRING=${ADDITIONAL_LIBWEBSOCKETS_C_FLAGS}" "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}" "-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>" "-DLWS_WITHOUT_EXTENSIONS=ON" "-DLWS_WITHOUT_TESTAPPS=ON" "-DLWS_WITH_SSL:BOOL=ON"
70+
CMAKE_ARGS "-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}" "-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}" "-DCMAKE_C_FLAGS:STRING=${ADDITIONAL_LIBWEBSOCKETS_C_FLAGS}" "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}" "-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>" "-DLWS_WITHOUT_EXTENSIONS=ON" "-DLWS_WITHOUT_TESTAPPS=ON" "-DLWS_WITH_SSL:BOOL=ON"
7171
)
7272

7373
set(LIBWEBSOCKETS_TARGET_NAME websockets${CMAKE_STATIC_LIBRARY_SUFFIX})
@@ -95,7 +95,7 @@ if (WPCP_BUILD_CHECK)
9595
check-code
9696
GIT_REPOSITORY git://github.com/libcheck/check
9797
GIT_TAG "0.10.0"
98-
CMAKE_ARGS "-DCMAKE_BUILD_TYPE:PATH=${CMAKE_BUILD_TYPE}" "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}" "-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>"
98+
CMAKE_ARGS "-DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}" "-DCMAKE_TOOLCHAIN_FILE:PATH=${CMAKE_TOOLCHAIN_FILE}" "-DCMAKE_PREFIX_PATH:PATH=${CMAKE_PREFIX_PATH}" "-DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>"
9999
BUILD_IN_SOURCE 1
100100
)
101101

0 commit comments

Comments
 (0)