CopernicaMarketingSoftware · maxvgi · Dec 20, 2018 · Dec 20, 2018 · Dec 20, 2018 · Dec 20, 2018
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,15 +5,17 @@ PROJECT(phpcpp)
 # Use CMake File with following options
 # PHPCPP_COMPILE_TS     Set flag if PHP was compiled with thread safe
 # PHPCPP_MSVCRT_STATIC  Set flag if you want to compile the MSVC runtime as a static library
+# PHPCPP_SHARED         Set flag if you want to compile shared library
 # PHPCPP_ARCH           Set to "x86_64" if architecture and PHP was compiled under x64 or "x86" for 32 bit
 # PHPCPP_PHP_PATH       The path to PHP sources
 
+set(CMAKE_CXX_STANDARD 11)
 LIST(APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR})
 
 IF(CMAKE_BUILD_TYPE MATCHES DEBUG)
-    ADD_DEFINITIONS(-DZEND_DEBUG=1)
+  ADD_DEFINITIONS(-DZEND_DEBUG=1)
 ELSE()
-    ADD_DEFINITIONS(-DZEND_DEBUG=0)
+  ADD_DEFINITIONS(-DZEND_DEBUG=0)
 ENDIF()
 
 IF (PHPCPP_COMPILE_TS)
@@ -25,6 +27,10 @@ ADD_DEFINITIONS(-D_CRT_SECURE_NO_WARNINGS)
 ADD_DEFINITIONS(-DBUILDING_PHPCPP)
 ADD_DEFINITIONS(-DZEND_WIN32_KEEP_INLINE)
 
+IF (NOT EXISTS "${PHPCPP_PHP_PATH}/main/php.h")
+  message(SEND_ERROR "The PHPCPP_PHP_PATH variable does not contain PHP sources path")
+ENDIF()
+
 IF (MSVC)
   # Should compile MSVC runtime static or dll
   IF (PHPCPP_MSVCRT_STATIC)
@@ -54,13 +60,13 @@ IF (MSVC)
 ENDIF ()
 
 INCLUDE_DIRECTORIES(
-  "${PHPCPP_PHP_PATH}/"
-  "${PHPCPP_PHP_PATH}/main"
-  "${PHPCPP_PHP_PATH}/Zend"
-  "${PHPCPP_PHP_PATH}/TSRM"
-  "${PHPCPP_PHP_PATH}/ext"
-  "${PHPCPP_PHP_PATH}/build/main"
-  "${PHPCPP_PHP_PATH}/build/Zend"
+        "${PHPCPP_PHP_PATH}/"
+        "${PHPCPP_PHP_PATH}/main"
+        "${PHPCPP_PHP_PATH}/Zend"
+        "${PHPCPP_PHP_PATH}/TSRM"
+        "${PHPCPP_PHP_PATH}/ext"
+        "${PHPCPP_PHP_PATH}/build/main"
+        "${PHPCPP_PHP_PATH}/build/Zend"
 )
 SET(PHP_LIBS "php")
 SET(PHP_LIB_PATH "")
@@ -87,179 +93,38 @@ ELSE()
   ENDIF()
 ENDIF()
 
-SET(PHPCPP_COMMON_SOURCES
-  common/modifiers.cpp
-  common/streambuf.cpp
-)
+FILE(GLOB PHPCPP_COMMON_SOURCES common/*.cpp)
+FILE(GLOB PHPCPP_COMMON_HEADERS common/*.h)
+FILE(GLOB PHPCPP_ZEND_SOURCES zend/*.cpp)
+FILE(GLOB PHPCPP_ZEND_HEADERS zend/*.h)
+FILE(GLOB PHPCPP_HEADERS_INCLUDE include/phpcpp/*.h)
 
-SET(PHPCPP_COMMON_HEADERS
-  common/extensionbase.h
-  common/includes.h
-  common/streambuf.h
-)
-
-ADD_LIBRARY(phpcpp-common STATIC
-  ${PHPCPP_COMMON_HEADERS}
-  ${PHPCPP_COMMON_SOURCES}
-)
-
-set_target_properties(phpcpp-common
-  PROPERTIES
-  ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
-  LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
-  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
-)
-
-SET(PHPCPP_ZEND_SOURCES
-  zend/base.cpp
-  zend/callable.cpp
-  zend/classbase.cpp
-  zend/classimpl.cpp
-  zend/constant.cpp
-  zend/constantfuncs.cpp
-  zend/eval.cpp
-  zend/exception_handler.cpp
-  zend/exists.cpp
-  zend/extension.cpp
-  zend/extensionimpl.cpp
-  zend/fatalerror.cpp
-  zend/file.cpp
-  zend/function.cpp
-  zend/functor.cpp
-  zend/global.cpp
-  zend/globals.cpp
-  zend/hashmember.cpp
-  zend/ini.cpp
-  zend/inivalue.cpp
-  zend/iteratorimpl.cpp
-  zend/members.cpp
-  zend/module.cpp
-  zend/namespace.cpp
-  zend/object.cpp
-  zend/sapi.cpp
-  zend/script.cpp
-  zend/streambuf.cpp
-  zend/streams.cpp
-  zend/super.cpp
-  zend/value.cpp
-  zend/valueiterator.cpp
-  zend/zendcallable.cpp
-  zend/zval.cpp
-)
-
-SET(PHPCPP_ZEND_HEADERS
-  zend/arithmetic.h
-  zend/boolmember.h
-  zend/callable.h
-  zend/classimpl.h
-  zend/compileroptions.h
-  zend/constantimpl.h
-  zend/delayedfree.h
-  zend/executestate.h
-  zend/extensionimpl.h
-  zend/extensionpath.h
-  zend/floatmember.h
-  zend/functor.h
-  zend/hashiterator.h
-  zend/includes.h
-  zend/init.h
-  zend/invaliditerator.h
-  zend/iteratorimpl.h
-  zend/lowercase.h
-  zend/member.h
-  zend/method.h
-  zend/module.h
-  zend/nativefunction.h
-  zend/notimplemented.h
-  zend/nullmember.h
-  zend/numericmember.h
-  zend/objectimpl.h
-  zend/opcodes.h
-  zend/origexception.h
-  zend/parametersimpl.h
-  zend/property.h
-  zend/string.h
-  zend/stringmember.h
-  zend/symbol.h
-  zend/symbol.h
-  zend/traverseiterator.h
-  zend/valueiteratorimpl.h
-)
-
-SET(PHPCPP_HEADERS_INCLUDE
-  include/argument.h
-  include/array.h
-  include/arrayaccess.h
-  include/base.h
-  include/byref.h
-  include/byval.h
-  include/call.h
-  include/class.h
-  include/classbase.h
-  include/classtype.h
-  include/constant.h
-  include/countable.h
-  include/deprecated.h
-  include/errors.h
-  include/exception.h
-  include/extension.h
-  include/fatalerror.h
-  include/file.h
-  include/function.h
-  include/global.h
-  include/globals.h
-  include/hashmember.h
-  include/hashparent.h
-  include/ini.h
-  include/inivalue.h
-  include/interface.h
-  include/iterator.h
-  include/modifiers.h
-  include/namespace.h
-  include/noexcept.h
-  include/object.h
-  include/parameters.h
-  include/platform.h
-  include/script.h
-  include/serializable.h
-  include/streams.h
-  include/super.h
-  include/thread_local.h
-  include/traversable.h
-  include/type.h
-  include/value.h
-  include/valueiterator.h
-  include/version.h
-  include/visibility.h
-  include/zendcallable.h
-  include/zval.h
-)
 
 LINK_DIRECTORIES(${PHP_LIB_PATH})
 
 IF (PHPCPP_SHARED)
   ADD_LIBRARY(phpcpp SHARED
-    ${PHPCPP_HEADERS_INCLUDE}
-    ${PHPCPP_ZEND_HEADERS}
-    ${PHPCPP_ZEND_SOURCES}
-    phpcpp.h
-  )
-
-  TARGET_LINK_LIBRARIES(phpcpp phpcpp-common ${PHP_LIBS})
+          ${PHPCPP_COMMON_HEADERS}
+          ${PHPCPP_COMMON_SOURCES}
+          ${PHPCPP_HEADERS_INCLUDE}
+          ${PHPCPP_ZEND_HEADERS}
+          ${PHPCPP_ZEND_SOURCES}
+          phpcpp.h
+          )
 ELSE()
   ADD_LIBRARY(phpcpp STATIC
-    ${PHPCPP_HEADERS_INCLUDE}
-    ${PHPCPP_ZEND_HEADERS}
-    ${PHPCPP_ZEND_SOURCES}
-    phpcpp.h
-  )
-
-  TARGET_LINK_LIBRARIES(phpcpp STATIC phpcpp-common ${PHP_LIBS})
+          ${PHPCPP_COMMON_HEADERS}
+          ${PHPCPP_COMMON_SOURCES}
+          ${PHPCPP_HEADERS_INCLUDE}
+          ${PHPCPP_ZEND_HEADERS}
+          ${PHPCPP_ZEND_SOURCES}
+          phpcpp.h
+          )
 ENDIF()
 
 SET_TARGET_PROPERTIES(phpcpp
-  PROPERTIES
-  ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
-  LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
-  RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
-)
+        PROPERTIES
+        ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
+        LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
+        RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}"
+        )
diff --git a/Makefile b/Makefile
@@ -221,7 +221,7 @@ install:
 	${MKDIR} ${INSTALL_HEADERS}/phpcpp
 	${MKDIR} ${INSTALL_LIB}
 	${CP} phpcpp.h ${INSTALL_HEADERS}
-	${CP} include/*.h ${INSTALL_HEADERS}/phpcpp
+	${CP} include/phpcpp/*.h ${INSTALL_HEADERS}/phpcpp
 	if [ -e ${PHP_SHARED_LIBRARY} ]; then \
 		${CP} ${PHP_SHARED_LIBRARY} ${INSTALL_LIB}/; \
 		${LN} ${INSTALL_LIB}/${PHP_SHARED_LIBRARY} ${INSTALL_LIB}/libphpcpp.so.$(SONAME); \

diff --git a/common/includes.h b/common/includes.h
@@ -15,8 +15,8 @@
 /**
  *  Public include files
  */
-#include "../include/visibility.h"
-#include "../include/modifiers.h"
+#include "../include/phpcpp/visibility.h"
+#include "../include/phpcpp/modifiers.h"
 
 /**
  *  Generic implementation header files

diff --git a/documentation/install.html b/documentation/install.html
@@ -86,3 +86,44 @@ <h2 id="osx">Compiling on OSX?</h2>
     be added to it.
 </p>
 
+
+<h2 id="cmake">Compiling using cmake</h2>
+<p>
+    You could use PHP-CPP as a part of your project. You can install it into your source tree using command
+</p>
+<p>
+<pre class="language-bash"><code>git submodule add git://github.com/CopernicaMarketingSoftware/PHP-CPP.git
+</code></pre>
+</p>
+<p>
+    For example, part of your CMakeLists.txt may look like this:
+</p>
+<p>
+<pre class="language-cmake"><code>FIND_PROGRAM(PHP_CONFIG NAMES php-config)
+
+execute_process(
+    COMMAND ${PHP_CONFIG} --include-dir
+    OUTPUT_VARIABLE PHPCPP_PHP_PATH
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+)
+# or: SET(PHPCPP_PHP_PATH "/usr/include/php/20160303" CACHE STRING "")
+SET(PHPCPP_ARCH "x86_64" CACHE STRING "")
+
+include_directories(PHP-CPP include)
+add_subdirectory(PHP-CPP)
+target_link_libraries(YourTarget PRIVATE phpcpp)
+</code></pre>
+</p>
+<p>
+    For full list of options look through CMakeLists.txt file comments.
+</p>
+<p>
+    Or you could compile and install PHP-CPP using Makefile and then reference it in your CMakeLists.txt like this:
+</p>
+
+<p>
+<pre class="language-cmake"><code>find_library(phpcpp REQUIRED)
+target_link_libraries(YourTarget PRIVATE phpcpp)
+</code></pre>
+</p>
+
diff --git a/include/argument.h → include/phpcpp/argument.h b/include/argument.h → include/phpcpp/argument.h
diff --git a/include/array.h → include/phpcpp/array.h b/include/array.h → include/phpcpp/array.h
diff --git a/include/arrayaccess.h → include/phpcpp/arrayaccess.h b/include/arrayaccess.h → include/phpcpp/arrayaccess.h
diff --git a/include/base.h → include/phpcpp/base.h b/include/base.h → include/phpcpp/base.h
diff --git a/include/byref.h → include/phpcpp/byref.h b/include/byref.h → include/phpcpp/byref.h
diff --git a/include/byval.h → include/phpcpp/byval.h b/include/byval.h → include/phpcpp/byval.h
diff --git a/include/call.h → include/phpcpp/call.h b/include/call.h → include/phpcpp/call.h
diff --git a/include/class.h → include/phpcpp/class.h b/include/class.h → include/phpcpp/class.h
diff --git a/include/classbase.h → include/phpcpp/classbase.h b/include/classbase.h → include/phpcpp/classbase.h
diff --git a/include/classtype.h → include/phpcpp/classtype.h b/include/classtype.h → include/phpcpp/classtype.h
diff --git a/include/constant.h → include/phpcpp/constant.h b/include/constant.h → include/phpcpp/constant.h
diff --git a/include/countable.h → include/phpcpp/countable.h b/include/countable.h → include/phpcpp/countable.h
diff --git a/include/deprecated.h → include/phpcpp/deprecated.h b/include/deprecated.h → include/phpcpp/deprecated.h
diff --git a/include/errors.h → include/phpcpp/errors.h b/include/errors.h → include/phpcpp/errors.h
diff --git a/include/exception.h → include/phpcpp/exception.h b/include/exception.h → include/phpcpp/exception.h
diff --git a/include/extension.h → include/phpcpp/extension.h b/include/extension.h → include/phpcpp/extension.h
diff --git a/include/fatalerror.h → include/phpcpp/fatalerror.h b/include/fatalerror.h → include/phpcpp/fatalerror.h
diff --git a/include/file.h → include/phpcpp/file.h b/include/file.h → include/phpcpp/file.h
diff --git a/include/function.h → include/phpcpp/function.h b/include/function.h → include/phpcpp/function.h
diff --git a/include/global.h → include/phpcpp/global.h b/include/global.h → include/phpcpp/global.h
diff --git a/include/globals.h → include/phpcpp/globals.h b/include/globals.h → include/phpcpp/globals.h
diff --git a/include/hashmember.h → include/phpcpp/hashmember.h b/include/hashmember.h → include/phpcpp/hashmember.h
diff --git a/include/hashparent.h → include/phpcpp/hashparent.h b/include/hashparent.h → include/phpcpp/hashparent.h
diff --git a/include/ini.h → include/phpcpp/ini.h b/include/ini.h → include/phpcpp/ini.h
diff --git a/include/inivalue.h → include/phpcpp/inivalue.h b/include/inivalue.h → include/phpcpp/inivalue.h
diff --git a/include/interface.h → include/phpcpp/interface.h b/include/interface.h → include/phpcpp/interface.h
diff --git a/include/iterator.h → include/phpcpp/iterator.h b/include/iterator.h → include/phpcpp/iterator.h
diff --git a/include/modifiers.h → include/phpcpp/modifiers.h b/include/modifiers.h → include/phpcpp/modifiers.h
diff --git a/include/namespace.h → include/phpcpp/namespace.h b/include/namespace.h → include/phpcpp/namespace.h
diff --git a/include/noexcept.h → include/phpcpp/noexcept.h b/include/noexcept.h → include/phpcpp/noexcept.h
diff --git a/include/object.h → include/phpcpp/object.h b/include/object.h → include/phpcpp/object.h
diff --git a/include/parameters.h → include/phpcpp/parameters.h b/include/parameters.h → include/phpcpp/parameters.h
diff --git a/include/platform.h → include/phpcpp/platform.h b/include/platform.h → include/phpcpp/platform.h
diff --git a/include/script.h → include/phpcpp/script.h b/include/script.h → include/phpcpp/script.h
diff --git a/include/serializable.h → include/phpcpp/serializable.h b/include/serializable.h → include/phpcpp/serializable.h
diff --git a/include/streams.h → include/phpcpp/streams.h b/include/streams.h → include/phpcpp/streams.h
diff --git a/include/super.h → include/phpcpp/super.h b/include/super.h → include/phpcpp/super.h
diff --git a/include/thread_local.h → include/phpcpp/thread_local.h b/include/thread_local.h → include/phpcpp/thread_local.h
diff --git a/include/traversable.h → include/phpcpp/traversable.h b/include/traversable.h → include/phpcpp/traversable.h
diff --git a/include/type.h → include/phpcpp/type.h b/include/type.h → include/phpcpp/type.h
diff --git a/include/value.h → include/phpcpp/value.h b/include/value.h → include/phpcpp/value.h
diff --git a/include/valueiterator.h → include/phpcpp/valueiterator.h b/include/valueiterator.h → include/phpcpp/valueiterator.h
diff --git a/include/version.h → include/phpcpp/version.h b/include/version.h → include/phpcpp/version.h
diff --git a/include/visibility.h → include/phpcpp/visibility.h b/include/visibility.h → include/phpcpp/visibility.h
diff --git a/include/zendcallable.h → include/phpcpp/zendcallable.h b/include/zendcallable.h → include/phpcpp/zendcallable.h
diff --git a/include/zval.h → include/phpcpp/zval.h b/include/zval.h → include/phpcpp/zval.h