move sio_packet to internal,update cmake script

melode11 · melode11 · commit e0d662382a11 · 2015-04-08T14:56:15.000+08:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,6 +3,7 @@ PROJECT(sioclient)
 
 set(BOOST_VER "1.55.0" CACHE STRING "boost version" )
 set(BOOST_PATH "__boost__" CACHE STRING "boost root path" )
+set(CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++" )
 
 if(${BOOST_PATH} STREQUAL "__boost__" )
     set(BOOST_INCLUDE "__boost__" CACHE STRING "boost include path" )
@@ -31,7 +32,15 @@ find_package(Boost ${BOOST_VER} COMPONENTS system date_time random)
 if(Boost_FOUND)
     include_directories(${Boost_INCLUDE_DIRS} ${PROJECT_SOURCE_DIR}/src ${PROJECT_SOURCE_DIR}/lib/websocketpp ${PROJECT_SOURCE_DIR}/lib/rapidjson/include) 
     aux_source_directory(${PROJECT_SOURCE_DIR}/src ALL_SRC)
-    MESSAGE( STATUS "SRC FILES:        " ${ALL_SRC} )
+    aux_source_directory(${PROJECT_SOURCE_DIR}/src/internal ALL_SRC)
+    file(GLOB ALL_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h )
+    MESSAGE(STATUS ${ALL_HEADERS} )
     add_library(sioclient STATIC ${ALL_SRC}) 
     target_link_libraries(sioclient ${Boost_LIBRARIES})
+    INSTALL(FILES ${ALL_HEADERS} 
+        DESTINATION "${PROJECT_SOURCE_DIR}/build/include"
+        )
+    INSTALL(TARGETS sioclient
+        DESTINATION "${PROJECT_SOURCE_DIR}/build/lib"
+        )
 endif() 
diff --git a/examples/QT/SioChatDemo/SioChatDemo.pro b/examples/QT/SioChatDemo/SioChatDemo.pro
@@ -17,16 +17,16 @@ CONFIG+=c++11
 SOURCES += main.cpp\
         mainwindow.cpp \
     ../../../src/sio_client.cpp \
-    ../../../src/sio_packet.cpp \
     ../../../src/sio_socket.cpp \
+    ../../../src/internal/sio_packet.cpp \
     ../../../src/internal/sio_client_impl.cpp \
     nicknamedialog.cpp
 
 HEADERS  += mainwindow.h \
         ../../../src/sio_client.h \
         ../../../src/sio_message.h \
-        ../../../src/sio_packet.h \
         ../../../src/sio_socket.h \
+        ../../../src/internal/sio_packet.h \
         ../../../src/internal/sio_client_impl.h \
     nicknamedialog.h
 
diff --git a/examples/iOS/SioChatDemo/SioChatDemo.xcodeproj/project.pbxproj b/examples/iOS/SioChatDemo/SioChatDemo.xcodeproj/project.pbxproj
@@ -7,6 +7,8 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		CE1D31A01AD5087800895150 /* sio_packet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE1D319E1AD5087800895150 /* sio_packet.cpp */; };
+		CE1D31A11AD5087800895150 /* sio_packet.h in Headers */ = {isa = PBXBuildFile; fileRef = CE1D319F1AD5087800895150 /* sio_packet.h */; };
 		CE2958691ACE4589000ABD30 /* sio_client_impl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE2958671ACE442F000ABD30 /* sio_client_impl.cpp */; };
 		CE29586A1ACE4592000ABD30 /* sio_socket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE2958621ACE2CD6000ABD30 /* sio_socket.cpp */; };
 		CE3B3B401AC8F365003CEB94 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CE3B3B3F1AC8F365003CEB94 /* main.m */; };
@@ -21,8 +23,6 @@
 		CE3B3E8C1ACA5446003CEB94 /* sio_client.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE3B3E871ACA5446003CEB94 /* sio_client.cpp */; };
 		CE3B3E8D1ACA5446003CEB94 /* sio_client.h in Headers */ = {isa = PBXBuildFile; fileRef = CE3B3E881ACA5446003CEB94 /* sio_client.h */; };
 		CE3B3E8E1ACA5446003CEB94 /* sio_message.h in Headers */ = {isa = PBXBuildFile; fileRef = CE3B3E891ACA5446003CEB94 /* sio_message.h */; };
-		CE3B3E8F1ACA5446003CEB94 /* sio_packet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE3B3E8A1ACA5446003CEB94 /* sio_packet.cpp */; };
-		CE3B3E901ACA5446003CEB94 /* sio_packet.h in Headers */ = {isa = PBXBuildFile; fileRef = CE3B3E8B1ACA5446003CEB94 /* sio_packet.h */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -62,6 +62,8 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		CE1D319E1AD5087800895150 /* sio_packet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sio_packet.cpp; sourceTree = "<group>"; };
+		CE1D319F1AD5087800895150 /* sio_packet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sio_packet.h; sourceTree = "<group>"; };
 		CE2958621ACE2CD6000ABD30 /* sio_socket.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sio_socket.cpp; sourceTree = "<group>"; };
 		CE2958631ACE2CD6000ABD30 /* sio_socket.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sio_socket.h; sourceTree = "<group>"; };
 		CE2958661ACE2CDD000ABD30 /* sio_client_impl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sio_client_impl.h; sourceTree = "<group>"; };
@@ -85,8 +87,6 @@
 		CE3B3E871ACA5446003CEB94 /* sio_client.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sio_client.cpp; sourceTree = "<group>"; };
 		CE3B3E881ACA5446003CEB94 /* sio_client.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sio_client.h; sourceTree = "<group>"; };
 		CE3B3E891ACA5446003CEB94 /* sio_message.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sio_message.h; sourceTree = "<group>"; };
-		CE3B3E8A1ACA5446003CEB94 /* sio_packet.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sio_packet.cpp; sourceTree = "<group>"; };
-		CE3B3E8B1ACA5446003CEB94 /* sio_packet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sio_packet.h; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -126,6 +126,8 @@
 		CE2958651ACE2CDD000ABD30 /* internal */ = {
 			isa = PBXGroup;
 			children = (
+				CE1D319E1AD5087800895150 /* sio_packet.cpp */,
+				CE1D319F1AD5087800895150 /* sio_packet.h */,
 				CE2958661ACE2CDD000ABD30 /* sio_client_impl.h */,
 				CE2958671ACE442F000ABD30 /* sio_client_impl.cpp */,
 			);
@@ -228,8 +230,6 @@
 				CE3B3E871ACA5446003CEB94 /* sio_client.cpp */,
 				CE3B3E881ACA5446003CEB94 /* sio_client.h */,
 				CE3B3E891ACA5446003CEB94 /* sio_message.h */,
-				CE3B3E8A1ACA5446003CEB94 /* sio_packet.cpp */,
-				CE3B3E8B1ACA5446003CEB94 /* sio_packet.h */,
 			);
 			name = src;
 			path = ../../../src;
@@ -243,7 +243,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				CE3B3E8E1ACA5446003CEB94 /* sio_message.h in Headers */,
-				CE3B3E901ACA5446003CEB94 /* sio_packet.h in Headers */,
+				CE1D31A11AD5087800895150 /* sio_packet.h in Headers */,
 				CE3B3E8D1ACA5446003CEB94 /* sio_client.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -419,9 +419,9 @@
 			buildActionMask = 2147483647;
 			files = (
 				CE29586A1ACE4592000ABD30 /* sio_socket.cpp in Sources */,
+				CE1D31A01AD5087800895150 /* sio_packet.cpp in Sources */,
 				CE2958691ACE4589000ABD30 /* sio_client_impl.cpp in Sources */,
 				CE3B3E8C1ACA5446003CEB94 /* sio_client.cpp in Sources */,
-				CE3B3E8F1ACA5446003CEB94 /* sio_packet.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/src/internal/sio_client_impl.cpp b/src/internal/sio_client_impl.cpp
@@ -9,7 +9,6 @@
 #include "sio_client_impl.h"
 #include <sstream>
 #include <boost/date_time/posix_time/posix_time.hpp>
-#include "sio_packet.h"
 #include <mutex>
 // Comment this out to disable handshake logging to stdout
 #if DEBUG || _DEBUG
@@ -20,7 +19,8 @@
 
 using boost::posix_time::milliseconds;
 
-namespace sio {
+namespace sio
+{
     client_impl::client_impl() :
     m_con_state(con_closed),
     m_ping_interval(0),
diff --git a/src/internal/sio_client_impl.h b/src/internal/sio_client_impl.h
@@ -25,7 +25,7 @@ typedef websocketpp::config::asio_client client_config;
 #include <map>
 #include <thread>
 #include "../sio_client.h"
-#include "../sio_packet.h"
+#include "sio_packet.h"
 
 namespace sio
 {
diff --git a/src/internal/sio_packet.cpp b/src/internal/sio_packet.cpp
diff --git a/src/internal/sio_packet.h b/src/internal/sio_packet.h
@@ -7,7 +7,7 @@
 #ifndef __SIO_PACKET_H__
 #define __SIO_PACKET_H__
 #include <sstream>
-#include "sio_message.h"
+#include "../sio_message.h"
 #include <functional>
 
 namespace sio
diff --git a/src/sio_client.cpp b/src/sio_client.cpp
@@ -13,7 +13,6 @@ using std::stringstream;
 
 namespace sio
 {
-    
     client::client():
     m_impl(new client_impl())
     {
diff --git a/src/sio_client.h b/src/sio_client.h
@@ -11,8 +11,8 @@
 #include "sio_message.h"
 #include "sio_socket.h"
 
-namespace sio {
-    
+namespace sio
+{
     class client_impl;
     
     class client {
diff --git a/src/sio_socket.cpp b/src/sio_socket.cpp
@@ -1,5 +1,5 @@
 #include "sio_socket.h"
-#include "sio_packet.h"
+#include "internal/sio_packet.h"
 #include "internal/sio_client_impl.h"
 #include <boost/asio/deadline_timer.hpp>
 #include <boost/system/error_code.hpp>
@@ -14,8 +14,8 @@
 #define NULL_GUARD(_x_)  \
 if(_x_ == NULL) return
 
-namespace sio {
-    
+namespace sio
+{
     class event_adapter
     {
     public:

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ typedef websocketpp::config::asio_client client_config;`
`25`	`25`	`#include <map>`
`26`	`26`	`#include <thread>`
`27`	`27`	`#include "../sio_client.h"`
`28`		`-#include "../sio_packet.h"`
	`28`	`+#include "sio_packet.h"`
`29`	`29`
`30`	`30`	`namespace sio`
`31`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ using std::stringstream;`
`13`	`13`
`14`	`14`	`namespace sio`
`15`	`15`	`{`
`16`		`-`
`17`	`16`	`client::client():`
`18`	`17`	`m_impl(new client_impl())`
`19`	`18`	`{`