bug fixes.

CMakeLists.txt

@@ -309,7 +309,7 @@ endif(UNIX)
 
 
 if (CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-	set( CMAKE_C_FLAGS "-Wall -Werror -O4 -fvisibility=hidden " )
+	set( CMAKE_C_FLAGS "-Wall -O4 -fvisibility=hidden " )
 endif ()
 
 source_group("Headers Private"  FILES ${HDR_PRIVATE})
@@ -353,13 +353,13 @@ endif(WIN32)
 
 # Set the so version of the lib.
 # Equivalent to LDFLAGS=-version-info x:x:x
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-	foreach(lib websockets websockets_shared)
-		set_target_properties(${lib} 
-			PROPERTIES
-			SOVERSION ${SOVERSION})
-	endforeach()
-endif()
+# if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+# 	foreach(lib websockets websockets_shared)
+# 		set_target_properties(${lib} 
+# 			PROPERTIES
+# 			SOVERSION ${SOVERSION})
+# 	endforeach()
+# endif()
 
 set(LIB_LIST)
 
@@ -407,7 +407,7 @@ if (NOT WITHOUT_EXTENSIONS)
 	endif()
 
 	# Make sure ZLib is compiled before the libs.
-	foreach (lib websockets websockets_shared)
+	foreach (lib websockets)
 		add_dependencies(${lib} ZLIB)
 	endforeach()
 

ios/build_framework.py

@@ -38,10 +38,9 @@ def build_opencv(srcroot, buildroot, target, arch):
     # for some reason, if you do not specify CMAKE_BUILD_TYPE, it puts libs to "RELEASE" rather than "Release"
     cmakeargs = ("-GXcode " +
                 "-DCMAKE_TOOLCHAIN_FILE=%s/ios/cmake/Toolchains/Toolchain-%s_Xcode.cmake " +
-                "-DWITH_SSL=0" +
+                "-DWITH_SSL=0 " +
                 "-DWITHOUT_SERVER=1 " +
                 "-DWITHOUT_TESTAPPS=1 " +
-                "-DWITHOUT_EXTENSIONS=1 " +
                 "-DCMAKE_INSTALL_PREFIX:PATH=/Users/james/Project/libwebsockets/install") % (srcroot, target)
     # if cmake cache exists, just rerun cmake to update OpenCV.xproj if necessary
     if os.path.isfile(os.path.join(builddir, "CMakeCache.txt")):