Sync develop with master #4

Merged
RoshanSyed merged 144 commits from master into develop 2019-12-16 15:20:56 +00:00
Showing only changes of commit 0e5a4fea68 - Show all commits

View file

@ -151,11 +151,6 @@ ENDIF()
find_package(OpenSSL REQUIRED)
set(RAPIDJSON_USE_SSE2 ON)
set(RAPIDJSON_USE_SSE42 ON)
find_package(RapidJSON REQUIRED)
set( CMAKE_FIND_LIBRARY_SUFFIXES ${ORIGINAL_LIB_SUFFIXES} )
option( UNITY_BUILD OFF )