Adjust for new Platform Requirements
This commit is contained in:
+14
-15
@@ -42,11 +42,9 @@ if(APPLE)
|
||||
IXWEBSOCKET_USE_SECURE_TRANSPORT
|
||||
)
|
||||
target_compile_options(ixwebsocket PRIVATE
|
||||
"SHELL:-arch i386"
|
||||
"SHELL:-arch x86_64"
|
||||
)
|
||||
target_link_options(ixwebsocket PRIVATE
|
||||
"SHELL:-arch i386"
|
||||
"SHELL:-arch x86_64"
|
||||
)
|
||||
target_link_libraries(ixwebsocket PRIVATE
|
||||
@@ -68,15 +66,8 @@ elseif(UNIX)
|
||||
target_compile_options(ixwebsocket PRIVATE
|
||||
-nodefaultlibs
|
||||
)
|
||||
if(BIT STREQUAL "32")
|
||||
target_compile_options(ixwebsocket PRIVATE
|
||||
-m32
|
||||
)
|
||||
target_link_options(ixwebsocket PRIVATE
|
||||
-m32
|
||||
)
|
||||
endif()
|
||||
if (NOT OPENSSL_FOUND)
|
||||
|
||||
if (NOT OPENSSL_FOUND)
|
||||
find_package(OpenSSL REQUIRED)
|
||||
endif()
|
||||
message(STATUS "System OpenSSL: " ${OPENSSL_VERSION})
|
||||
@@ -90,11 +81,19 @@ elseif(UNIX)
|
||||
pthread
|
||||
)
|
||||
elseif(WIN32)
|
||||
message("Building ixwebsocket for Windows ${BIT} into ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}")
|
||||
if (BIT STREQUAL "32")
|
||||
message("Building ixwebsocket for Windows ${BIT} into ${PROJECT_BINARY_DIR}/FSConnect")
|
||||
|
||||
set_target_properties(ixwebsocket PROPERTIES
|
||||
RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}
|
||||
)
|
||||
set_target_properties(ixwebsocket PROPERTIES
|
||||
RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/FSConnect"
|
||||
)
|
||||
else()
|
||||
message("Building fileixwebsocket for Windows ${BIT} into ${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}")
|
||||
|
||||
set_target_properties(ixwebsocket PROPERTIES
|
||||
RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/Plugin/${PLUGIN_NAME}/${BIT}"
|
||||
)
|
||||
endif()
|
||||
|
||||
target_compile_definitions(ixwebsocket PRIVATE
|
||||
IXWEBSOCKET_USE_TLS
|
||||
|
||||
Reference in New Issue
Block a user