Install hhvm_wrapper.php and tc-print

It's useful to have these debugging tools available
in HHVM installs.

Author: mszabo-wikia

hphp/CMakeLists.txt

@@ -71,14 +71,6 @@ add_library(hhvm_base_headers INTERFACE)
 hphp_link(hhvm_base_headers INTERFACE)
 target_include_directories(hhvm_base_headers INTERFACE ${CMAKE_SOURCE_DIR})
 
-# Only thing to do directly in tools is install this one script. Tools also has
-# its own Makefile, so just do it here instead of dealing with moving that all
-# around.
-install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/tools/oss-repo-mode
-  RENAME hhvm-repo-mode
-  DESTINATION bin
-  COMPONENT dev)
-
 add_definitions("-DUSE_CMAKE")
 
 enable_language(ASM)
@@ -87,10 +79,6 @@ if (NOT PCRE_LIBRARY)
   link_libraries(pcre)
 endif()
 
-add_subdirectory(tools/hfsort)
-add_subdirectory(tools/version)
-add_subdirectory(tools/tc-print)
-
 add_subdirectory(compiler)
 add_subdirectory(hack)
 add_subdirectory(hhbbc)
@@ -117,7 +105,5 @@ if (TEST_BIN)
   add_subdirectory(test)
 endif ()
 
-add_subdirectory(tools/gdb)
-
 # Keep this last
-add_subdirectory(tools/hphpize)
+add_subdirectory(tools)

hphp/tools/CMakeLists.txt

@@ -0,0 +1,15 @@
+install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/oss-repo-mode
+  RENAME hhvm-repo-mode
+  DESTINATION bin
+  COMPONENT dev)
+
+install(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/hhvm_wrapper.php
+  DESTINATION bin
+  COMPONENT dev)
+
+add_subdirectory(hfsort)
+add_subdirectory(version)
+add_subdirectory(tc-print)
+add_subdirectory(gdb)
+# Keep this last
+add_subdirectory(hphpize)

hphp/tools/tc-print/CMakeLists.txt

@@ -33,3 +33,5 @@ link_object_libraries(tc-print ${HHVM_WHOLE_ARCHIVE_LIBRARIES})
 target_link_libraries(tc-print ${HHVM_LINK_LIBRARIES})
 embed_all_systemlibs(tc-print "${CMAKE_CURRENT_BINARY_DIR}/../.."
                               "${CMAKE_CURRENT_BINARY_DIR}/tc-print")
+
+install(TARGETS tc-print)