Skip to content
Browse files

minor changes.

  • Loading branch information...
1 parent ece2484 commit 3d7e4d7bb95216b72964ac2894aa8f4dda15a320 @gloob committed
View
2 cmake/ConfigureChecks.cmake
@@ -125,7 +125,7 @@ check_type_size("ssize_t" SIZEOF_SSIZE_T)
check_type_size("unsigned long" SIZEOF_ULONG)
-set(ulong "unsigned long")
+#set(ulong "unsigned long")
if(NOT SIZEOF_ULONG)
set(ulong "unsigned long")
endif(NOT SIZEOF_ULONG)
View
6 cmake/Zend/CMakeLists.txt
@@ -92,7 +92,6 @@ set(Zend_library_SRCS
zend_execute.c
zend_execute_API.c
zend_highlight.c
- zend_ini_scanner.c
zend_llist.c
zend_opcode.c
zend_operators.c
@@ -120,11 +119,6 @@ set(Zend_library_SRCS
zend_exceptions.c
zend_strtod.c
zend_gc.c
-
- zend_language_scanner.c
- zend_language_parser.c
- zend_ini_scanner.c
- zend_ini_parser.c
)
# Headers:
View
2 cmake/ext/CMakeLists.txt
@@ -9,6 +9,8 @@
include(php/PHP_ARG_ENABLE)
include(php/PHP_NEW_EXTENSION)
+include_directories(${PHP_BINARY_DIR}/Zend)
+
set(EXTENSION_DIR ${CMAKE_CURRENT_SOURCE_DIR})
file(GLOB_RECURSE EXTENSION_MODULES . CMakeLists.txt)
View
5 cmake/ext/iconv/CMakeLists.txt
@@ -21,4 +21,7 @@ set(EXT_ICONV_SOURCES
#add_library(EXT_XML [STATIC | SHARED | MODULE] [EXCLUDE_FROM_ALL]
add_library(EXT_ICONV ${EXT_ICONV_SOURCES})
-target_link_libraries(EXT_ICONV ${ICONV_LIBRARY})
+if(ICONV_FOUND)
+ target_link_libraries(EXT_ICONV ${ICONV_LIBRARY})
+endif(ICONV_FOUND)
+
View
1 cmake/ext/pdo_sqlite/CMakeLists.txt
@@ -9,6 +9,7 @@
# Extension: pdo_sqlite
include_directories(${EXTENSION_DIR})
+include_directories("${EXTENSION_DIR}/sqlite3/libsqlite")
set(EXT_PDO_SQLITE_SOURCES
pdo_sqlite.c sqlite_driver.c sqlite_statement.c
View
3 cmake/ext/sqlite3/CMakeLists.txt
@@ -8,10 +8,9 @@
# Extension: sqlite3
-#include_directories("")
+include_directories("${CMAKE_CURRENT_SOURCE_DIR}/libsqlite")
set(sqlite3_extra_sources libsqlite/sqlite3.c)
-
set(EXT_SQLITE3_SOURCES
sqlite3.c ${sqlite3_extra_sources}
)
View
40 cmake/main/CMakeLists.txt
@@ -1,30 +1,26 @@
# ########## Project setup ##########
-PROJECT(main C)
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.5)
+project(main C)
# Includes
-message("$$ including: ${CMAKE_CURRENT_SOURCE_DIR}")
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR})
+#message("$$ including: ${CMAKE_CURRENT_SOURCE_DIR}")
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-# ######### General setup ##########
-INCLUDE_DIRECTORIES(${main_SOURCE_DIR})
-INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR})
+#include_directories(${CMAKE_SOURCE_DIR})
## Automatic way ? <- REFACTOR THIS
-INCLUDE_DIRECTORIES(${PHP_SOURCE_DIR}/Zend)
-INCLUDE_DIRECTORIES(${PHP_SOURCE_DIR}/TSRM)
-INCLUDE_DIRECTORIES(${PHP_SOURCE_DIR}/ext/date/lib)
+include_directories(${PHP_SOURCE_DIR}/Zend)
+include_directories(${PHP_BINARY_DIR}/Zend)
+include_directories(${PHP_SOURCE_DIR}/TSRM)
+include_directories(${PHP_SOURCE_DIR}/ext/date/lib)
-SET(PHP_main_LIBRARIES)
+set(PHP_main_LIBRARIES)
# ########## main library ##########
# Sources:
-SET(main_library_SRCS
- internal_functions.c
- internal_functions_cli.c
+set(main_library_SRCS
+# internal_functions_cli.c
# internal_functions_nw.c
# internal_functions_win32.c
main.c
@@ -61,13 +57,11 @@ SET(main_library_SRCS
streams/xp_socket.c
streams/mmap.c
streams/glob_wrapper.c
-
- internal_functions.c
)
# Headers:
-SET(main_library_HDRS
+set(main_library_HDRS
build-defs.h
fopen_wrappers.h
logos.h
@@ -99,11 +93,11 @@ SET(main_library_HDRS
win95nt.h
)
-CONFIGURE_FILE(internal_functions.c.in ${CMAKE_SOURCE_DIR}/internal_functions.c)
+configure_file(internal_functions.c.in ${CMAKE_SOURCE_DIR}/internal_functions.c)
# actual target:
-ADD_LIBRARY(main ${main_library_SRCS} ${main_library_HDRS})
-SET_TARGET_PROPERTIES(main PROPERTIES VERSION 0.0.0)
+add_library(main ${main_library_SRCS} ${main_library_HDRS})
+set_target_properties(main PROPERTIES VERSION 0.0.0)
# add install target:
-INSTALL(TARGETS main DESTINATION lib)
+install(TARGETS main DESTINATION lib)

0 comments on commit 3d7e4d7

Please sign in to comment.
Something went wrong with that request. Please try again.