From 0510fa4a2779494ff0f5e3db4e936d0b122b030e 2012-03-06 09:33:21 From: Vitaly Takmazov Date: 2012-03-06 09:33:21 Subject: [PATCH] Merge branch 'master' of https://github.com/hanzz/libtransport --- diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dcb192c40653a58c11c25dfa11c7333159a798f2..925ce5f4c4c7b5cf519b251fb0ca7f329b7c17f6 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,6 +1,12 @@ cmake_minimum_required(VERSION 2.6) FILE(GLOB SRC *.cpp *.h) FILE(GLOB_RECURSE SWIFTEN_SRC ../include/Swiften/*.cpp) + +# Build without openssl on windows +if (WIN32) + string(REGEX REPLACE "[^;]+;?/OpenSSL/[^;]+;?" "" SWIFTEN_SRC "${SWIFTEN_SRC}") +endif() + FILE(GLOB HEADERS ../include/transport/*.h) if (CPPUNIT_FOUND)