Merge pull request #37 from cyanray/dev/cyanray

调整目录结构

Author: cyanray

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.1)
 
-project (mirai-cpp VERSION 0.4.4)
+project (mirai-cpp VERSION 1.2.0)
 
 set(CMAKE_CXX_STANDARD 11)
 
@@ -23,13 +23,9 @@ aux_source_directory(./src SRCS)
 
 add_library(${PROJECT_NAME} ${LIBRARY_TYPE} ${SRCS})
 target_include_directories(${PROJECT_NAME} PUBLIC 
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/mirai>
     $<INSTALL_INTERFACE:include>
     )
-target_include_directories(${PROJECT_NAME} PUBLIC 
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/mirai-third-party>
-    $<INSTALL_INTERFACE:third-party>
-    )
 
 if(BUILD_SHARED_LIBS)
     if(WIN32)
@@ -41,7 +37,7 @@ endif()
 
 
 
-option(MIRAI_CPP_BUILD_EXAMPLES "Build examples" ON)
+option(MIRAI_CPP_BUILD_EXAMPLES "Build examples" OFF)
 if(MIRAI_CPP_BUILD_EXAMPLES)
     add_subdirectory(examples)
 endif(MIRAI_CPP_BUILD_EXAMPLES)
@@ -66,11 +62,6 @@ if(MIRAI_CPP_INSTALL)
         DESTINATION ${CMAKE_INSTALL_PREFIX}
         )
 
-        install(
-        DIRECTORY mirai-third-party
-        DESTINATION ${CMAKE_INSTALL_PREFIX}
-        )
-
     install(
         TARGETS ${PROJECT_NAME}
         EXPORT  ${PROJECT_NAME}Targets

examples/CMakeLists.txt

@@ -10,6 +10,10 @@ endif(MSVC)
 macro(api_exe target)
     add_executable(${target} ${target}.cpp)
     target_link_libraries(${target} mirai-cpp)
+    # gcc 要连接 pthread
+    if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    target_link_libraries(${target} pthread)
+    endif()
 endmacro()
 
 api_exe(RepeatMessage)

include/mirai.h

@@ -1,9 +1 @@
-#pragma once
-#ifndef mirai_cpp__mirai_h_H_
-#define mirai_cpp__mirai_h_H_
-
-#include "defs/defs.hpp"
-#include "events/events.hpp"
-#include "mirai_bot.hpp"
-
-#endif // !mirai_cpp__mirai_h_H_
+#include <mirai/mirai.h>

include/defs/defs.hpp renamed to include/mirai/defs/defs.hpp

@@ -2,7 +2,7 @@
 #ifndef mirai_cpp_defs_friend_hpp_H_
 #define mirai_cpp_defs_friend_hpp_H_
 
-#include <nlohmann/json.hpp>
+#include "third-party/nlohmann/json.hpp"
 #include "qq_types.hpp"
 #include "serializable.hpp"
 

include/defs/friend.hpp renamed to include/mirai/defs/friend.hpp

@@ -2,7 +2,7 @@
 #ifndef mirai_cpp_defs_group_hpp_H_
 #define mirai_cpp_defs_group_hpp_H_
 
-#include <nlohmann/json.hpp>
+#include "third-party/nlohmann/json.hpp"
 #include "qq_types.hpp"
 #include "serializable.hpp"
 

include/defs/group.hpp renamed to include/mirai/defs/group.hpp

@@ -2,7 +2,7 @@
 #ifndef mirai_cpp_defs_group_config_hpp_H_
 #define mirai_cpp_defs_group_config_hpp_H_
 
-#include <nlohmann/json.hpp>
+#include "third-party/nlohmann/json.hpp"
 #include "serializable.hpp"
 
 namespace Cyan

include/defs/group_config.hpp renamed to include/mirai/defs/group_config.hpp

@@ -2,7 +2,7 @@
 #ifndef mirai_cpp_defs_group_member_hpp_H_
 #define mirai_cpp_defs_group_member_hpp_H_
 
-#include <nlohmann/json.hpp>
+#include "third-party/nlohmann/json.hpp"
 #include "qq_types.hpp"
 #include "serializable.hpp"
 #include "group.hpp"

include/defs/group_member.hpp renamed to include/mirai/defs/group_member.hpp

@@ -3,7 +3,7 @@
 #define mirai_cpp_defs_group_member_info_hpp_H_
 
 #include <string>
-#include <nlohmann/json.hpp>
+#include "third-party/nlohmann/json.hpp"
 #include "serializable.hpp"
 
 

include/defs/group_member_info.hpp renamed to include/mirai/defs/group_member_info.hpp

@@ -2,7 +2,7 @@
 #ifndef mirai_cpp_defs_message_chain_hpp_H_
 #define mirai_cpp_defs_message_chain_hpp_H_
 
-#include <nlohmann/json.hpp>
+#include "third-party/nlohmann/json.hpp"
 #include <sstream>
 #include <vector>
 #include <memory>