Dependencies are compiled as submodules

Author: Maxim Leontyev

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "modules/json"]
+	path = modules/json
+	url = git://github.com/nlohmann/json.git
+[submodule "modules/td"]
+	path = modules/td
+	url = git://github.com/tdlib/td.git

CMakeLists.txt

@@ -4,59 +4,92 @@ set(EXT_NAME tdlib)
 set(EXT_VERSION 0.0.7)
 project(${EXT_NAME} VERSION ${EXT_VERSION} LANGUAGES CXX)
 
-set(CMAKE_CXX_FLAGS "-std=c++14 ${CMAKE_CXX_FLAGS}")
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-find_package(Td 1.3.0 REQUIRED)
-if(NOT Td_FOUND)
-	message(SEND_ERROR "Failed to find Td")
-	return()
-endif()
-
-#find_library(PHPCPP phpcpp)
-#if(NOT PHPCPP)
-#	message(SEND_ERROR "Failed to find PHP-CPP")
-#	return()
-#endif()
 
-find_file(NLOHMANN_JSON_INCLUDE_FILE nlohmann/json.hpp)
-if(NOT NLOHMANN_JSON_INCLUDE_FILE)
-	message(SEND_ERROR "Failed to find nlohmann_json")
-endif()
 
 FIND_PROGRAM(PHP_CONFIG NAMES php-config)
 if(NOT PHP_CONFIG)
     message(SEND_ERROR "Failed to find php-config")
     return()
 endif()
+
+execute_process(
+        COMMAND ${PHP_CONFIG} --include-dir
+        OUTPUT_VARIABLE PHPCPP_PHP_PATH
+        OUTPUT_STRIP_TRAILING_WHITESPACE
+)
 execute_process(
-    COMMAND ${PHP_CONFIG} --configure-options
-    COMMAND sed -ne "s/^.*--with-config-file-scan-dir=\\([^ ]*\\).*/\\1/p"
-    OUTPUT_VARIABLE PHP_CONFIG_DIR
-    OUTPUT_STRIP_TRAILING_WHITESPACE
+        COMMAND ${PHP_CONFIG} --configure-options
+        COMMAND sed -ne "s/^.*--with-config-file-scan-dir=\\([^ ]*\\).*/\\1/p"
+        OUTPUT_VARIABLE PHP_CONFIG_DIR
+        OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 execute_process(
-    COMMAND ${PHP_CONFIG} --extension-dir
-    OUTPUT_VARIABLE PHP_EXTENSIONS_DIR
-    OUTPUT_STRIP_TRAILING_WHITESPACE
+        COMMAND ${PHP_CONFIG} --extension-dir
+        OUTPUT_VARIABLE PHP_EXTENSIONS_DIR
+        OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 execute_process(
-    COMMAND ${PHP_CONFIG} --vernum
-    OUTPUT_VARIABLE PHP_VERSION_NUMBER
-    OUTPUT_STRIP_TRAILING_WHITESPACE
+        COMMAND ${PHP_CONFIG} --vernum
+        OUTPUT_VARIABLE PHP_VERSION_NUMBER
+        OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
 if(PHP_VERSION_NUMBER LESS 70000)
     message(SEND_ERROR "PHP-CPP works only with PHP ^7.0. For older PHP versions, use the PHP-CPP-LEGACY instead.")
     return()
 endif()
 
-set(SOURCE_FILES tdlib.cpp include/TDLib/BaseJsonClient.cpp include/TDLib/JsonClient.cpp include/TDApi/TDLibParameters.cpp include/TDApi/TDLibLogConfiguration.cpp)
+
+
+
+
+add_subdirectory(modules/td)
+
+
+# PHP-CPP now has incorrect CMakeLists.txt
+# Waiting for fixes in PR 399 to be applied
+# todo: uncomment when the PHP-CPP problems will be fixed
+#SET(PHPCPP_ARCH "x86_64" CACHE STRING "")
+#include_directories(modules/PHP-CPP modules/PHP-CPP/include)
+#add_subdirectory(modules/PHP-CPP)
+find_library(PHPCPP phpcpp)
+if(NOT PHPCPP)
+	message(SEND_ERROR "Failed to find PHP-CPP")
+	return()
+endif()
+
+
+set(JSON_BuildTests OFF CACHE INTERNAL "")
+add_subdirectory(modules/json)
+
+
+
+set(SOURCE_FILES
+        tdlib.cpp
+        include/TDLib/BaseJsonClient.cpp
+        include/TDLib/JsonClient.cpp
+        include/TDApi/TDLibParameters.cpp
+        include/TDApi/TDLibLogConfiguration.cpp
+        include/td_json_client_func.cpp
+        )
 set(EXT_INI_FILE ${EXT_NAME}.ini)
 
-set(CMAKE_SHARED_LIBRARY_PREFIX "")
 
+set(CMAKE_SHARED_LIBRARY_PREFIX "")
 add_library(${EXT_NAME} SHARED ${SOURCE_FILES})
-target_link_libraries(${EXT_NAME} phpcpp Td::TdJson Td::TdStatic)
+
+
+target_link_libraries(${EXT_NAME}
+        PRIVATE
+            Td::TdJson
+            Td::TdStatic
+            nlohmann_json::nlohmann_json
+        PUBLIC
+            phpcpp
+        )
 
 add_custom_command(TARGET ${EXT_NAME}
     POST_BUILD

README.md

@@ -61,27 +61,16 @@ $client->destroy();
 ```
 
 ## Required
- - [TDLib v1.3.0][1]
-```bash
-git clone https://github.com/tdlib/td.git
-cd td && mkdir build && cd build
-cmake -DCMAKE_BUILD_TYPE=Release ..
-cmake --build .
-sudo cmake --build . --target install
-```
  - [PHP-CPP v2.0.0][2]
+ 
+ All dependencies are installed via git submodules. But PHP-CPP
+ currently has buggy CMake configuration and should be globally installed as a library.
+ 
 ```bash
 git clone https://github.com/CopernicaMarketingSoftware/PHP-CPP.git
 cd PHP-CPP
 make
 sudo make install
-```
- - [nlohmann/json v3.2.0 (JSON for Modern C++)][3]
-```bash
-git clone https://github.com/nlohmann/json.git
-cd json && mkdir build && cd build
-cmake ..
-make install
 ```
 
 ## install extension

include/td_json_client_func.cpp

@@ -1,18 +1,19 @@
+#include <td/telegram/td_json_client.h>
 #include "TDLib/BaseJsonClient.hpp"
 #include "td_json_client_func.hpp"
 
 Php::Value td_json_client_func_create()
 {
     void *client_ptr = td_json_client_create();
-    BaseJsonClient *client = new BaseJsonClient(client_ptr);
+    auto *client = new BaseJsonClient(client_ptr);
     return Php::Object("TDLib\\BaseJsonClient", client);
 }
 
 void td_json_client_func_destroy(Php::Parameters &params)
 {
     Php::Value object = params[0];
     if(!object.instanceOf("TDLib\\BaseJsonClient")) throw Php::Exception("First parameter must be instance of TDLib\\BaseJsonClient.");
-    BaseJsonClient *client = (BaseJsonClient *)object.implementation();
+    auto *client = (BaseJsonClient *)object.implementation();
 
     client->destroy();
 }
@@ -22,7 +23,7 @@ Php::Value td_json_client_func_execute(Php::Parameters &params)
     Php::Value object = params[0];
     if(!object.instanceOf("TDLib\\BaseJsonClient")) throw Php::Exception("First parameter must be instance of TDLib\\BaseJsonClient.");
     const char *query = params[1];
-    BaseJsonClient *client = (BaseJsonClient *)object.implementation();
+    auto *client = (BaseJsonClient *)object.implementation();
 
     std::string result = client->execute(query);
     return result;
@@ -33,7 +34,7 @@ void td_json_client_func_send(Php::Parameters &params)
     Php::Value object = params[0];
     if(!object.instanceOf("TDLib\\BaseJsonClient")) throw Php::Exception("First parameter must be instance of TDLib\\BaseJsonClient.");
     const char *query = params[1];
-    BaseJsonClient *client = (BaseJsonClient *)object.implementation();
+    auto *client = (BaseJsonClient *)object.implementation();
 
     client->send(query);
 }
@@ -43,7 +44,7 @@ Php::Value td_json_client_func_receive(Php::Parameters &params)
     Php::Value object = params[0];
     if(!object.instanceOf("TDLib\\BaseJsonClient")) throw Php::Exception("First parameter must be instance of TDLib\\BaseJsonClient.");
     double timeout = params[1];
-    BaseJsonClient *client = (BaseJsonClient *)object.implementation();
+    auto *client = (BaseJsonClient *)object.implementation();
 
     std::string result = client->receive(timeout);
     return result;

include/td_json_client_func.hpp

@@ -1,10 +1,16 @@
-#ifndef TDLIB_TD_JSON_CLIENT_FUNC_H
-#define TDLIB_TD_JSON_CLIENT_FUNC_H
+#ifndef TD_JSON_CLIENT_FUNC_H
+#define TD_JSON_CLIENT_FUNC_H
+
+#include <phpcpp.h>
 
 Php::Value td_json_client_func_create();
+
 void td_json_client_func_destroy(Php::Parameters &params);
+
 Php::Value td_json_client_func_execute(Php::Parameters &params);
+
 void td_json_client_func_send(Php::Parameters &params);
+
 Php::Value td_json_client_func_receive(Php::Parameters &params);
 
-#endif // TDLIB_TD_JSON_CLIENT_FUNC_H
+#endif

modules/json

@@ -7,7 +7,7 @@
 
 #include "tdlib.hpp"
 
-#include "include/td_json_client_func.cpp"
+#include "include/td_json_client_func.hpp"
 #include "include/TDLib/JsonClient.hpp"
 #include "include/TDApi/TDLibParameters.hpp"
 #include "include/TDApi/TDLibLogConfiguration.hpp"