Some spring cleaning for the cmake file

Don't even check USE_HHVM/USE_HPHPC, hphpc died months ago.
HHVM_BINARY and HHVM_LIB_PATH_DEFAULT defines are no longer used.
HHVM_PATH is specific to test.

CMake/HPHPSetup.cmake

@@ -63,7 +63,6 @@ include(HPHPFunctions)
 include(HPHPFindLibs)
 
 add_definitions(-D_REENTRANT=1 -D_PTHREADS=1 -D__STDC_FORMAT_MACROS)
-add_definitions(-DHHVM_LIB_PATH_DEFAULT="${HPHP_HOME}/bin")
 
 if (LINUX)
 	add_definitions(-D_GNU_SOURCE)

CMakeLists.txt

@@ -26,9 +26,3 @@ include(CheckFunctionExists)
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/hphp)
 
-if ("$ENV{USE_HHVM}" STREQUAL "1")
-	message("Building for HHVM")
-endif()
-if ("$ENV{USE_HPHPC}" STREQUAL "1")
-	message(FATAL_ERROR "Building HPHPc is no longer supported")
-endif()

hphp/CMakeLists.txt

@@ -19,10 +19,7 @@ include(HPHPSetup)
 include(FollySetup)
 include(ExtZendCompat)
 
-# HHVM Build
-SET(USE_HHVM TRUE)
-SET(ENV{HHVM} 1)
-ADD_DEFINITIONS("-DHHVM -DHHVM_BINARY=1 -DHHVM_PATH=\\\"${HPHP_HOME}/hphp/hhvm/hhvm\\\"")
+add_definitions("-DHHVM")
 
 add_subdirectory(tools/bootstrap)
 

hphp/test/CMakeLists.txt

@@ -1,4 +1,5 @@
 set(CXX_SOURCES)
+add_definitions("-DHHVM_PATH=\"${HPHP_HOME}/hphp/hhvm/hhvm\"")
 
 set(RECURSIVE_SOURCE_SUBDIRS ext)
 foreach (dir ${RECURSIVE_SOURCE_SUBDIRS})