Created
April 13, 2017 01:35
-
-
Save joshuata/61d2e01b0681db5681889b12e64cdb06 to your computer and use it in GitHub Desktop.
Patch to land binaryen in homebrew
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/CMakeLists.txt b/CMakeLists.txt | |
index b9e135e..f7ba5c7 100644 | |
--- a/CMakeLists.txt | |
+++ b/CMakeLists.txt | |
@@ -1,5 +1,6 @@ | |
PROJECT(binaryen C CXX) | |
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.7) | |
+INCLUDE(GNUInstallDirs) | |
IF(NOT CMAKE_BUILD_TYPE) | |
MESSAGE(STATUS "No build type selected, default to Release") | |
@@ -140,12 +141,11 @@ ELSE() | |
ADD_LIBRARY(binaryen SHARED ${binaryen_SOURCES}) | |
ENDIF() | |
TARGET_LINK_LIBRARIES(binaryen ${all_passes} wasm asmjs ast support) | |
-INSTALL(TARGETS binaryen DESTINATION lib) | |
+INSTALL(TARGETS binaryen DESTINATION ${CMAKE_INSTALL_LIBDIR}) | |
-INSTALL(FILES src/binaryen-c.h DESTINATION include) | |
-INSTALL(FILES bin/wasm.js DESTINATION bin) | |
-INSTALL(FILES bin/binaryen.js DESTINATION bin) | |
-INSTALL(DIRECTORY src/js DESTINATION src) | |
+INSTALL(FILES src/binaryen-c.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) | |
+INSTALL(FILES bin/wasm.js DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}) | |
+INSTALL(FILES bin/binaryen.js DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}) | |
SET(wasm-shell_SOURCES | |
src/tools/wasm-shell.cpp | |
@@ -156,7 +156,7 @@ ADD_EXECUTABLE(wasm-shell | |
TARGET_LINK_LIBRARIES(wasm-shell wasm asmjs emscripten-optimizer ${all_passes} ast support) | |
SET_PROPERTY(TARGET wasm-shell PROPERTY CXX_STANDARD 11) | |
SET_PROPERTY(TARGET wasm-shell PROPERTY CXX_STANDARD_REQUIRED ON) | |
-INSTALL(TARGETS wasm-shell DESTINATION bin) | |
+INSTALL(TARGETS wasm-shell DESTINATION ${CMAKE_INSTALL_BINDIR}) | |
SET(wasm-opt_SOURCES | |
src/tools/wasm-opt.cpp | |
@@ -166,7 +166,7 @@ ADD_EXECUTABLE(wasm-opt | |
TARGET_LINK_LIBRARIES(wasm-opt wasm asmjs emscripten-optimizer ${all_passes} ast support) | |
SET_PROPERTY(TARGET wasm-opt PROPERTY CXX_STANDARD 11) | |
SET_PROPERTY(TARGET wasm-opt PROPERTY CXX_STANDARD_REQUIRED ON) | |
-INSTALL(TARGETS wasm-opt DESTINATION bin) | |
+INSTALL(TARGETS wasm-opt DESTINATION ${CMAKE_INSTALL_BINDIR}) | |
SET(asm2wasm_SOURCES | |
src/tools/asm2wasm.cpp | |
@@ -177,7 +177,7 @@ ADD_EXECUTABLE(asm2wasm | |
TARGET_LINK_LIBRARIES(asm2wasm emscripten-optimizer ${all_passes} wasm asmjs ast support) | |
SET_PROPERTY(TARGET asm2wasm PROPERTY CXX_STANDARD 11) | |
SET_PROPERTY(TARGET asm2wasm PROPERTY CXX_STANDARD_REQUIRED ON) | |
-INSTALL(TARGETS asm2wasm DESTINATION bin) | |
+INSTALL(TARGETS asm2wasm DESTINATION ${CMAKE_INSTALL_BINDIR}) | |
SET(s2wasm_SOURCES | |
src/tools/s2wasm.cpp | |
@@ -189,7 +189,7 @@ ADD_EXECUTABLE(s2wasm | |
TARGET_LINK_LIBRARIES(s2wasm passes wasm asmjs ast support) | |
SET_PROPERTY(TARGET s2wasm PROPERTY CXX_STANDARD 11) | |
SET_PROPERTY(TARGET s2wasm PROPERTY CXX_STANDARD_REQUIRED ON) | |
-INSTALL(TARGETS s2wasm DESTINATION bin) | |
+INSTALL(TARGETS s2wasm DESTINATION ${CMAKE_INSTALL_BINDIR}) | |
SET(wasm_as_SOURCES | |
src/tools/wasm-as.cpp | |
@@ -199,7 +199,7 @@ ADD_EXECUTABLE(wasm-as | |
TARGET_LINK_LIBRARIES(wasm-as wasm asmjs passes ast support) | |
SET_PROPERTY(TARGET wasm-as PROPERTY CXX_STANDARD 11) | |
SET_PROPERTY(TARGET wasm-as PROPERTY CXX_STANDARD_REQUIRED ON) | |
-INSTALL(TARGETS wasm-as DESTINATION bin) | |
+INSTALL(TARGETS wasm-as DESTINATION ${CMAKE_INSTALL_BINDIR}) | |
SET(wasm_dis_SOURCES | |
src/tools/wasm-dis.cpp | |
@@ -209,4 +209,4 @@ ADD_EXECUTABLE(wasm-dis | |
TARGET_LINK_LIBRARIES(wasm-dis passes wasm asmjs ast support) | |
SET_PROPERTY(TARGET wasm-dis PROPERTY CXX_STANDARD 11) | |
SET_PROPERTY(TARGET wasm-dis PROPERTY CXX_STANDARD_REQUIRED ON) | |
-INSTALL(TARGETS wasm-dis DESTINATION bin) | |
+INSTALL(TARGETS wasm-dis DESTINATION ${CMAKE_INSTALL_BINDIR}) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment