summarylogtreecommitdiffstats
path: root/cmake.patch
diff options
context:
space:
mode:
Diffstat (limited to 'cmake.patch')
-rw-r--r--cmake.patch24
1 files changed, 24 insertions, 0 deletions
diff --git a/cmake.patch b/cmake.patch
new file mode 100644
index 000000000000..f16f80e51c31
--- /dev/null
+++ b/cmake.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index dfabba7..c1a0ffc 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,7 +19,6 @@ find_package(Go 1.4 REQUIRED)
+ find_package(Git REQUIRED)
+ find_package(Protobuf 2.3 QUIET)
+ set(CPACK_PACKAGE_FILE_NAME ${CMAKE_PROJECT_NAME}-${CPACK_PACKAGE_VERSION_MAJOR}_${CPACK_PACKAGE_VERSION_MINOR}_${CPACK_PACKAGE_VERSION_PATCH}-${GO_PLATFORM}-${GO_ARCH})
+-set(CMAKE_INSTALL_PREFIX ${CMAKE_PROJECT_NAME})
+ set(PROJECT_PATH "${CMAKE_BINARY_DIR}/heka")
+ set(HEKA_PATH "${PROJECT_PATH}/src/github.com/mozilla-services/heka")
+ set(LUA_INCLUDE_PATH "${PROJECT_PATH}/include")
+@@ -285,9 +284,9 @@ endif()
+ if (INCLUDE_MOZSVC)
+ add_test(mozsvc ${GO_EXECUTABLE} test ${BENCHMARK_FLAG} ${COVERAGE_FLAG} github.com/mozilla-services/heka-mozsvc-plugins)
+ endif()
+-install(FILES "${HEKA_PATH}/cmd/heka-sbmgr/sbmgr.toml" "${HEKA_PATH}/cmd/heka-sbmgr/hekad.toml.sbmgr" DESTINATION bin)
++install(FILES "${HEKA_PATH}/cmd/heka-sbmgr/sbmgr.toml" "${HEKA_PATH}/cmd/heka-sbmgr/hekad.toml.sbmgr" DESTINATION "share/${CMAKE_PROJECT_NAME}/examples")
+ if(INCLUDE_SANDBOX)
+-install(FILES "${HEKA_PATH}/sandbox/lua/testsupport/hekabench_cbuf_counter.lua" DESTINATION bin)
++install(FILES "${HEKA_PATH}/sandbox/lua/testsupport/hekabench_cbuf_counter.lua" DESTINATION "share/${CMAKE_PROJECT_NAME}/examples")
+ endif()
+ install(FILES "${CMAKE_SOURCE_DIR}/LICENSE.txt" DESTINATION "share/${CMAKE_PROJECT_NAME}")
+ install(DIRECTORY "${CMAKE_SOURCE_DIR}/dasher" DESTINATION "share/${CMAKE_PROJECT_NAME}")