Updating script for android.

CMakeLists.txt

@@ -323,10 +323,10 @@ add_library(websockets STATIC
 			${HDR_PRIVATE}
 			${HDR_PUBLIC}
 			${SOURCES})
-#add_library(websockets_shared SHARED
-#			${HDR_PRIVATE}
-#			${HDR_PUBLIC}
-#			${SOURCES})
+add_library(websockets_shared SHARED
+			${HDR_PRIVATE}
+			${HDR_PUBLIC}
+			${SOURCES})
 
 if (WIN32)
 	# On Windows libs have the same file ending (.lib)
@@ -347,19 +347,19 @@ endif(WIN32)
 
 # We want the shared lib to be named "libwebsockets"
 # not "libwebsocket_shared".
-# set_target_properties(websockets_shared
-# 		PROPERTIES 
-# 		OUTPUT_NAME websockets)
+set_target_properties(websockets_shared
+		PROPERTIES 
+		OUTPUT_NAME websockets)
 
 # 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)
+	foreach (lib websockets websockets_shared)
 		add_dependencies(${lib} ZLIB)
 	endforeach()
 
@@ -461,7 +461,7 @@ if (UNIX)
 endif()
 
 # Setup the linking for all libs.
-foreach (lib websockets)
+foreach (lib websockets websockets_shared)
 	target_link_libraries(${lib} ${LIB_LIST})
 endforeach()
 
@@ -726,7 +726,7 @@ install(FILES ${HDR_PUBLIC}
 set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "Header files")
 
 # Install libs.
-install(TARGETS websockets
+install(TARGETS websockets websockets_shared
 		LIBRARY DESTINATION lib${LIB_SUFFIX}
 		ARCHIVE DESTINATION lib${LIB_SUFFIX}
 		COMPONENT libraries)