diff options
| author | Jay Phelps <hello@jayphelps.com> | 2018-08-17 14:06:22 -0600 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2018-08-17 13:06:22 -0700 |
| commit | fb578443a44cf400aadd2b0b1354f9da70bc08b9 (patch) | |
| tree | 72262c35404eed8cd10579b0fc5561f362a17c8e | |
| parent | 15b4a4c66fdad9a31bfb3912673378c1c9cf7e1c (diff) | |
| download | binaryen-fb578443a44cf400aadd2b0b1354f9da70bc08b9.tar.gz binaryen-fb578443a44cf400aadd2b0b1354f9da70bc08b9.tar.bz2 binaryen-fb578443a44cf400aadd2b0b1354f9da70bc08b9.zip | |
switch from CMAKE_SOURCE_DIR to PROJECT_SOURCE_DIR to support add_subdirectory(binaryen) (#1637)
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/passes/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 1e8424184..853acc3ad 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -170,10 +170,10 @@ INSTALL(FILES src/binaryen-c.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) # if binaryen.js and wasm.js were built (using "./build-js.sh", currently # optional), install them -IF(EXISTS "${CMAKE_SOURCE_DIR}/bin/binaryen.js") +IF(EXISTS "${PROJECT_SOURCE_DIR}/bin/binaryen.js") INSTALL(FILES bin/binaryen.js DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}) ENDIF() -IF(EXISTS "${CMAKE_SOURCE_DIR}/bin/wasm.js") +IF(EXISTS "${PROJECT_SOURCE_DIR}/bin/wasm.js") INSTALL(FILES bin/wasm.js DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}) ENDIF() diff --git a/src/passes/CMakeLists.txt b/src/passes/CMakeLists.txt index 25a1828dc..47079e4a0 100644 --- a/src/passes/CMakeLists.txt +++ b/src/passes/CMakeLists.txt @@ -1,7 +1,7 @@ add_custom_command( OUTPUT WasmIntrinsics.cpp - COMMAND python ${CMAKE_SOURCE_DIR}/scripts/embedwast.py ${CMAKE_SOURCE_DIR}/src/passes/wasm-intrinsics.wast ${CMAKE_CURRENT_BINARY_DIR}/WasmIntrinsics.cpp - DEPENDS ${CMAKE_SOURCE_DIR}/scripts/embedwast.py wasm-intrinsics.wast) + COMMAND python ${PROJECT_SOURCE_DIR}/scripts/embedwast.py ${PROJECT_SOURCE_DIR}/src/passes/wasm-intrinsics.wast ${CMAKE_CURRENT_BINARY_DIR}/WasmIntrinsics.cpp + DEPENDS ${PROJECT_SOURCE_DIR}/scripts/embedwast.py wasm-intrinsics.wast) SET(passes_SOURCES pass.cpp |