+14
-1183
lines changedFilter options
+14
-1183
lines changed Original file line number Diff line number Diff line change
@@ -30,5 +30,5 @@ if ("$ENV{USE_HHVM}" STREQUAL "1")
30 30
message("Building for HHVM")
31 31
endif()
32 32
if ("$ENV{USE_HPHPC}" STREQUAL "1")
33 -
message("Building for HPHPc")
33 +
message(FATAL_ERROR "Building HPHPc is no longer supported")
34 34
endif()
Original file line number Diff line number Diff line change
@@ -17,24 +17,10 @@
17 17 18 18
include(HPHPSetup)
19 19 20 -
if ("$ENV{USE_HHVM}" STREQUAL "1")
21 -
# HHVM Build
22 -
SET(USE_HHVM TRUE)
23 -
SET(ENV{HHVM} 1)
24 -
ADD_DEFINITIONS("-DHHVM -DHHVM_BINARY=1 -DHHVM_PATH=\\\"${HPHP_HOME}/hphp/hhvm/hhvm\\\"")
25 - 26 -
if ("$ENV{USE_HPHPC}" STREQUAL "1")
27 -
message(FATAL_ERROR "Both USE_HHVM and USE_HPHPC are set, you may only select one")
28 -
endif()
29 -
else()
30 -
# HPHPc Build
31 -
SET(USE_HHVM FALSE)
32 -
ADD_DEFINITIONS("-DHHVM_PATH=\"\"")
33 - 34 -
if (NOT "$ENV{USE_HPHPC}" STREQUAL "1")
35 -
message(FATAL_ERROR "You must select which version of HipHop to build by setting either USE_HHVM=1 or USE_HPHPC=1 in your environment")
36 -
endif()
37 -
endif()
20 +
# HHVM Build
21 +
SET(USE_HHVM TRUE)
22 +
SET(ENV{HHVM} 1)
23 +
ADD_DEFINITIONS("-DHHVM -DHHVM_BINARY=1 -DHHVM_PATH=\\\"${HPHP_HOME}/hphp/hhvm/hhvm\\\"")
38 24 39 25
set(RECURSIVE_SOURCE_SUBDIRS runtime/base runtime/eval runtime/ext runtime/vm system/gen system/lib util)
40 26
foreach (dir ${RECURSIVE_SOURCE_SUBDIRS})
@@ -70,13 +56,11 @@ foreach (file ${CXX_SOURCES})
70 56
endforeach(file ${CXX_SOURCES})
71 57 72 58
# remove ext/sep for hhvm
73 -
if (USE_HHVM)
74 -
foreach (file ${CXX_SOURCES})
75 -
if (${file} MATCHES "ext/sep")
76 -
list(REMOVE_ITEM CXX_SOURCES ${file})
77 -
endif()
78 -
endforeach(file ${CXX_SOURCES})
79 -
endif(USE_HHVM)
59 +
foreach (file ${CXX_SOURCES})
60 +
if (${file} MATCHES "ext/sep")
61 +
list(REMOVE_ITEM CXX_SOURCES ${file})
62 +
endif()
63 +
endforeach(file ${CXX_SOURCES})
80 64 81 65 82 66
if (EXISTS "${hphp_SOURCE_DIR}/HPHP_EXCLUDE_FILES.txt")
@@ -184,11 +168,7 @@ SET(CMAKE_CXX_ARCHIVE_APPEND "<CMAKE_AR> q <TARGET> <LINK_FLAGS> <OBJECTS>")
184 168
hphp_link(hphp_runtime_static)
185 169 186 170
add_subdirectory(compiler)
187 - 188 -
if (USE_HHVM)
189 -
add_subdirectory(runtime/ext_hhvm)
190 -
endif()
191 - 171 +
add_subdirectory(runtime/ext_hhvm)
192 172
add_subdirectory(hhvm)
193 173 194 174
if (NOT "$ENV{HPHP_NOTEST}" STREQUAL "1")
@@ -1,17 +1,6 @@
1 - 2 -
if (USE_HHVM)
3 -
set(HIPHOP_TARGET hhvm)
4 -
else()
5 -
set(HIPHOP_TARGET hphp)
6 -
endif()
7 - 8 1
set(CXX_SOURCES)
9 2
auto_sources(files "*.cpp" "")
10 3
list(APPEND CXX_SOURCES ${files})
11 4 12 -
add_executable(${HIPHOP_TARGET} ${CXX_SOURCES})
13 -
target_link_libraries(${HIPHOP_TARGET} hphp_analysis hphp_runtime_static)
14 - 15 -
if (USE_HHVM)
16 -
target_link_libraries(hhvm ext_hhvm_static)
17 -
endif()
5 +
add_executable(hhvm ${CXX_SOURCES})
6 +
target_link_libraries(hhvm hphp_analysis hphp_runtime_static ext_hhvm_static)
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.3