Add Windows support

Sean-Der · Sean-Der · commit a1aeef0827fa · 2020-05-10T22:51:32.000-07:00
Update CMake to support Windows, add travis Windows builder
diff --git a/.github/build_windows.bat b/.github/build_windows.bat
@@ -0,0 +1,6 @@
+call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
+mkdir build
+cd build
+cmd.exe /c cmake -G "NMake Makefiles" ..
+cmake -G "NMake Makefiles" -DBUILD_TEST=TRUE ..
+nmake
diff --git a/.travis.yml b/.travis.yml
@@ -114,3 +114,12 @@ matrix:
         - mkdir build && cd build
         - cmake .. -DBUILD_TEST=TRUE -DBUILD_OPENSSL_PLATFORM=linux-generic32
       script: make
+
+    - name: "Windows MSVC"
+      os: windows
+      script:
+        - choco install nasm strawberryperl
+        - unset CC CC_FOR_BUILD CXX CXX_FOR_BUILD # We want to use MSVC
+        - export "PATH=/c/Strawberry/perl/site/bin:/c/Strawberry/perl/bin:/c/Strawberry/c/bin:/c/Program Files/NASM:`pwd`/open-source/local/lib:`pwd`/open-source/local/bin:$PATH"
+        - .github/build_windows.bat
+        - cd build/tst && ./producer_test.exe --gtest_filter="-ProducerFunctionalityTest.stop_sending_frame_in_the_middle_of_streaming_offline_mode*"
diff --git a/CMake/Dependencies/libcurl-CMakeLists.txt b/CMake/Dependencies/libcurl-CMakeLists.txt
@@ -17,7 +17,11 @@ set(CMAKE_ARGS
 
 # By default use openssl
 if (USE_MBEDTLS)
-    set(CMAKE_ARGS ${CMAKE_ARGS} -DCMAKE_USE_MBEDTLS=1)
+    set(CMAKE_ARGS ${CMAKE_ARGS} -DCMAKE_USE_MBEDTLS=1 -DCURL_STATIC_CRT=1)
+endif()
+
+if (WIN32)
+    set(CMAKE_ARGS ${CMAKE_ARGS} -DCMAKE_USE_WINSSL=1 -DCURL_STATIC_CRT=1)
 endif()
 
 ExternalProject_Add(project_libcurl
diff --git a/CMake/Dependencies/libjsmn-CMakeLists.txt b/CMake/Dependencies/libjsmn-CMakeLists.txt
@@ -2,20 +2,13 @@ cmake_minimum_required(VERSION 2.8)
 
 project(libjsmn-download NONE)
 
-find_program(MAKE_EXE NAMES make)
-
 include(ExternalProject)
 ExternalProject_Add(project_libjsmn
     GIT_REPOSITORY    https://github.com/zserge/jsmn.git
     GIT_TAG           v1.0.0
     PREFIX            ${CMAKE_CURRENT_BINARY_DIR}/build
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND     ${MAKE_EXE} CFLAGS=-fPIC
-    BUILD_IN_SOURCE   TRUE
-    INSTALL_COMMAND
-        ${CMAKE_COMMAND} -E make_directory ${OPEN_SRC_INSTALL_PREFIX}/lib &&
-        ${CMAKE_COMMAND} -E make_directory ${OPEN_SRC_INSTALL_PREFIX}/include &&
-        ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libjsmn/libjsmn.a ${OPEN_SRC_INSTALL_PREFIX}/lib &&
-        ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libjsmn/jsmn.h ${OPEN_SRC_INSTALL_PREFIX}/include
+    PATCH_COMMAND     git apply --ignore-whitespace ${CMAKE_SOURCE_DIR}/../../CMake/Dependencies/libjsmn-add-cmakelists.patch
+    CMAKE_ARGS        -DCMAKE_INSTALL_PREFIX=${OPEN_SRC_INSTALL_PREFIX}
+    BUILD_ALWAYS      TRUE
     TEST_COMMAND      ""
 )
diff --git a/CMake/Dependencies/libjsmn-add-cmakelists.patch b/CMake/Dependencies/libjsmn-add-cmakelists.patch
@@ -0,0 +1,17 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+new file mode 100644
+index 0000000..f4a1d44
+--- /dev/null
++++ b/CMakeLists.txt
+@@ -0,0 +1,11 @@
++cmake_minimum_required(VERSION 2.8)
++project(jsmn C)
++
++
++if("${CMAKE_C_COMPILER_ID}" MATCHES "GNU|Clang")
++    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
++endif()
++
++add_library(jsmn STATIC jsmn.h jsmn.c)
++install(TARGETS jsmn DESTINATION lib)
++install(FILES jsmn.h DESTINATION include)
diff --git a/CMake/Dependencies/libopenssl-CMakeLists.txt b/CMake/Dependencies/libopenssl-CMakeLists.txt
@@ -2,16 +2,20 @@ cmake_minimum_required(VERSION 2.8)
 
 project(libopenssl-download NONE)
 
-find_program(MAKE_EXE NAMES make)
-
-if (BUILD_STATIC)
-  SET(OPENSSL_EXTRA ${OPENSSL_EXTRA} no-shared no-dso)
-endif()
-
-if (DEFINED BUILD_OPENSSL_PLATFORM AND NOT BUILD_OPENSSL_PLATFORM STREQUAL OFF)
-  SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libopenssl/Configure ${OPENSSL_EXTRA} --prefix=${OPEN_SRC_INSTALL_PREFIX} --openssldir=${OPEN_SRC_INSTALL_PREFIX} ${BUILD_OPENSSL_PLATFORM})
+if (WIN32)
+  find_program(MAKE_EXE NAMES nmake)
+  SET(CONFIGURE_COMMAND perl ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libopenssl/Configure VC-WIN64A no-asm --prefix=${OPEN_SRC_INSTALL_PREFIX} --openssldir=${OPEN_SRC_INSTALL_PREFIX})
 else()
-  SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libopenssl/config ${OPENSSL_EXTRA} --prefix=${OPEN_SRC_INSTALL_PREFIX} --openssldir=${OPEN_SRC_INSTALL_PREFIX})
+  find_program(MAKE_EXE NAMES make)
+  if (BUILD_STATIC)
+    SET(OPENSSL_EXTRA ${OPENSSL_EXTRA} no-shared no-dso)
+  endif()
+
+  if (DEFINED BUILD_OPENSSL_PLATFORM AND NOT BUILD_OPENSSL_PLATFORM STREQUAL OFF)
+    SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libopenssl/Configure ${OPENSSL_EXTRA} --prefix=${OPEN_SRC_INSTALL_PREFIX} --openssldir=${OPEN_SRC_INSTALL_PREFIX} ${BUILD_OPENSSL_PLATFORM})
+  else()
+    SET(CONFIGURE_COMMAND ${CMAKE_CURRENT_BINARY_DIR}/build/src/project_libopenssl/config ${OPENSSL_EXTRA} --prefix=${OPEN_SRC_INSTALL_PREFIX} --openssldir=${OPEN_SRC_INSTALL_PREFIX})
+  endif()
 endif()
 
 include(ExternalProject)
@@ -20,7 +24,7 @@ ExternalProject_Add(project_libopenssl
     GIT_TAG           OpenSSL_1_1_0l
     PREFIX            ${CMAKE_CURRENT_BINARY_DIR}/build
     CONFIGURE_COMMAND ${CONFIGURE_COMMAND}
-    BUILD_COMMAND     ${MAKE_EXE} -j 4
+    BUILD_COMMAND     ${MAKE_EXE}
     BUILD_IN_SOURCE   TRUE
     INSTALL_COMMAND   ${MAKE_EXE} install_sw
     TEST_COMMAND      ""
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -123,17 +123,25 @@ else()
 endif()
 
 if(BUILD_COMMON_CURL)
-    pkg_check_modules(LIBCURL REQUIRED libcurl)
+  if (OPEN_SRC_INSTALL_PREFIX)
+    find_package(CURL REQUIRED PATHS ${OPEN_SRC_INSTALL_PREFIX})
+  else()
+    find_package(CURL REQUIRED)
+  endif()
 
-    set(OPEN_SRC_INCLUDE_DIRS ${OPEN_SRC_INCLUDE_DIRS} ${LIBCURL_INCLUDE_DIRS})
-    link_directories(${LIBCURL_LIBRARY_DIRS})
+  set(OPEN_SRC_INCLUDE_DIRS ${OPEN_SRC_INCLUDE_DIRS} ${CURL_INCLUDE_DIRS})
+  link_directories(${CURL_LIBRARY_DIRS})
 endif()
 
 if (BUILD_COMMON_LWS)
+  if (WIN32)
+    find_package(LIBWEBSOCKETS REQUIRED PATHS ${OPEN_SRC_INSTALL_PREFIX})
+  else()
     pkg_check_modules(LIBWEBSOCKET REQUIRED libwebsockets)
+  endif()
 
-    set(OPEN_SRC_INCLUDE_DIRS ${OPEN_SRC_INCLUDE_DIRS} ${LIBWEBSOCKET_INCLUDE_DIRS})
-    link_directories(${LIBWEBSOCKET_LIBRARY_DIRS})
+    set(OPEN_SRC_INCLUDE_DIRS ${OPEN_SRC_INCLUDE_DIRS} ${LIBWEBSOCKETS_INCLUDE_DIRS})
+    link_directories(${LIBWEBSOCKETS_LIBRARY_DIRS})
 endif()
 
 find_package(Jsmn REQUIRED)
@@ -180,6 +188,10 @@ if("${CMAKE_C_COMPILER_ID}" MATCHES "GNU|Clang")
     endif()
 endif()
 
+if(MSVC)
+  add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_WARNINGS -D_SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING)
+endif()
+
 file(GLOB KVS_COMMON_SOURCE_FILES_BASE "src/source/Common/*.c")
 file(GLOB KVS_COMMON_SOURCE_FILES_LWS "src/source/Common/Lws/*.c")
 file(GLOB KVS_COMMON_SOURCE_FILES_CURL "src/source/Common/Curl/*.c")
@@ -190,6 +202,7 @@ include_directories(${PIC_HEADERS})
 include_directories(${KINESIS_VIDEO_PRODUCER_C_SRC}/src/include)
 include_directories(${OPEN_SRC_INCLUDE_DIRS})
 include_directories(${KINESIS_VIDEO_OPEN_SOURCE_SRC}/include)
+include_directories(${KINESIS_VIDEO_OPEN_SOURCE_SRC}/local/include)
 
 add_subdirectory(${KINESIS_VIDEO_PIC_SRC} ./kvspic EXCLUDE_FROM_ALL)
 
@@ -217,8 +230,8 @@ if(BUILD_COMMON_LWS)
             ${JSMN_LIBRARY}
             ${OPENSSL_CRYPTO_LIBRARY}
             ${OPENSSL_SSL_LIBRARY}
-            ${LIBWEBSOCKET_LIBRARIES}
-            ${LIBCURL_LIBRARIES}
+            ${LIBWEBSOCKETS_LIBRARIES}
+            CURL::libcurl
             kvspicUtils)
 endif()
 
@@ -228,29 +241,20 @@ target_compile_definitions(kvsCommonCurl PRIVATE KVS_BUILD_WITH_CURL ${CPRODUCER
 target_link_libraries(kvsCommonCurl
         ${JSMN_LIBRARY}
         ${PRODUCER_CRYPTO_LIBRARY}
-        ${LIBCURL_LIBRARIES})
-
-add_library(cproducer SHARED ${PRODUCER_C_SOURCE_FILES})
+        CURL::libcurl)
 
-if (MINGW)
-# Use PRIVATE otherwise anything linking against cproducer will also link with pic again,
-# causing duplicate symbols
-target_link_libraries(cproducer PRIVATE
-    kvspic
-    kvsCommonCurl)
+if (WIN32)
+  add_library(cproducer STATIC ${PRODUCER_C_SOURCE_FILES})
 else()
-target_link_libraries(cproducer
-        kvspic
-        kvsCommonCurl)
+  add_library(cproducer SHARED ${PRODUCER_C_SOURCE_FILES})
 endif()
+target_link_libraries(cproducer PUBLIC kvspic kvsCommonCurl)
 
 add_executable(kvsVideoOnlyStreamingSample ${KINESIS_VIDEO_PRODUCER_C_SRC}/samples/KvsVideoOnlyStreamingSample.c)
-target_link_libraries(kvsVideoOnlyStreamingSample
-    cproducer)
+target_link_libraries(kvsVideoOnlyStreamingSample cproducer)
 
 add_executable(kvsAacAudioVideoStreamingSample ${KINESIS_VIDEO_PRODUCER_C_SRC}/samples/KvsAacAudioVideoStreamingSample.c)
-target_link_libraries(kvsAacAudioVideoStreamingSample
-        cproducer)
+target_link_libraries(kvsAacAudioVideoStreamingSample cproducer)
 
 if (BUILD_TEST)
     add_subdirectory(tst)
diff --git a/tst/CMakeLists.txt b/tst/CMakeLists.txt
@@ -5,25 +5,20 @@ project (producerTest)
 set(CMAKE_CXX_STANDARD 11)
 set(KINESIS_VIDEO_PRODUCER_C_SRC "${CMAKE_CURRENT_SOURCE_DIR}/..")
 
-set(THREADS_PREFER_PTHREAD_FLAG ON)
-find_package(Threads)
-set(EXE_LIBRARIES Threads::Threads ${CMAKE_DL_LIBS})
-
-if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "Windows")
-    set(EXE_LIBRARIES ${EXE_LIBRARIES} rt)
+if (OPEN_SRC_INSTALL_PREFIX)
+  find_package(GTest REQUIRED PATHS ${OPEN_SRC_INSTALL_PREFIX})
+else()
+  find_package(GTest REQUIRED)
 endif()
 
-set(GTEST_ROOT $ENV{KVS_GTEST_ROOT})
-find_package(GTest REQUIRED)
+SET(GTEST_LIBNAME GTest::gtest)
+if (TARGET GTest::GTest)
+  SET(GTEST_LIBNAME GTest::GTest)
+endif()
 
 include_directories(${KINESIS_VIDEO_PRODUCER_C_SRC})
 
 file(GLOB PRODUCER_TEST_SOURCE_FILES "*.cpp")
 
 add_executable(producer_test ${PRODUCER_TEST_SOURCE_FILES})
-target_link_libraries(producer_test
-        cproducer
-        GTest::GTest
-        GTest::Main
-        ${EXE_LIBRARIES}
-        ${Jsmn})
+target_link_libraries(producer_test cproducer ${GTEST_LIBNAME})
diff --git a/tst/ProducerFunctionalityTest.cpp b/tst/ProducerFunctionalityTest.cpp
@@ -296,7 +296,8 @@ TEST_F(ProducerFunctionalityTest, create_client_repeated_create_stream_put_frame
 {
     UINT32 i, j, k;
     UINT32 totalFragments = 2;
-    UINT32 totalFrames = totalFragments * TEST_FPS, streamCount = 10;
+    UINT32 totalFrames = totalFragments * TEST_FPS;
+    static const UINT32 streamCount = 10;
     TID threadIds[streamCount];
 
     createDefaultProducerClient(FALSE, FUNCTIONALITY_TEST_CREATE_STREAM_TIMEOUT);

Original file line number	Diff line number	Diff line change
`@@ -296,7 +296,8 @@ TEST_F(ProducerFunctionalityTest, create_client_repeated_create_stream_put_frame`
`296`	`296`	`{`
`297`	`297`	`UINT32 i, j, k;`
`298`	`298`	`UINT32 totalFragments = 2;`
`299`		`- UINT32 totalFrames = totalFragments * TEST_FPS, streamCount = 10;`
	`299`	`+ UINT32 totalFrames = totalFragments * TEST_FPS;`
	`300`	`+ static const UINT32 streamCount = 10;`
`300`	`301`	`TID threadIds[streamCount];`
`301`	`302`
`302`	`303`	`createDefaultProducerClient(FALSE, FUNCTIONALITY_TEST_CREATE_STREAM_TIMEOUT);`