diff options
| author |  bunnei | 2018-01-16 15:20:01 -0500 |
|---|---|---|
| committer |  GitHub | 2018-01-16 15:20:01 -0500 |
| commit | f10a7081e38419effd0ca6d6b9679310de47b867 (patch) | |
| tree | c4e3fbd4486920f53a6c60237599967bc4826a96 | |
| parent | Update README.md to include AppVeyor build status. (diff) | |
| parent | CMake: Override PYTHON environment variable for libunicorn (diff) | |
| download | yuzu-f10a7081e38419effd0ca6d6b9679310de47b867.tar.gz yuzu-f10a7081e38419effd0ca6d6b9679310de47b867.tar.xz yuzu-f10a7081e38419effd0ca6d6b9679310de47b867.zip | |
Merge pull request #48 from spycrab/cmake_python
CMake: Override PYTHON environment variable for libunicorn
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ec9467e5..d814bb74f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -240,8 +240,10 @@ if (NOT UNICORN_FOUND) | |||
| 240 | set(LIBUNICORN_INCLUDE_DIR "${UNICORN_PREFIX}/include" CACHE PATH "Path to Unicorn headers" FORCE) | 240 | set(LIBUNICORN_INCLUDE_DIR "${UNICORN_PREFIX}/include" CACHE PATH "Path to Unicorn headers" FORCE) |
| 241 | set(UNICORN_DLL_DIR "${UNICORN_PREFIX}/" CACHE PATH "Path to unicorn dynamic library" FORCE) | 241 | set(UNICORN_DLL_DIR "${UNICORN_PREFIX}/" CACHE PATH "Path to unicorn dynamic library" FORCE) |
| 242 | 242 | ||
| 243 | find_package(PythonInterp 2.7 REQUIRED) | ||
| 244 | |||
| 243 | add_custom_command(OUTPUT ${LIBUNICORN_LIBRARY} | 245 | add_custom_command(OUTPUT ${LIBUNICORN_LIBRARY} |
| 244 | COMMAND ${CMAKE_COMMAND} -E env UNICORN_ARCHS="aarch64" /bin/sh make.sh | 246 | COMMAND ${CMAKE_COMMAND} -E env UNICORN_ARCHS="aarch64" PYTHON="${PYTHON_EXECUTABLE}" /bin/sh make.sh |
| 245 | WORKING_DIRECTORY ${UNICORN_PREFIX} | 247 | WORKING_DIRECTORY ${UNICORN_PREFIX} |
| 246 | ) | 248 | ) |
| 247 | # ALL makes this custom target build every time | 249 | # ALL makes this custom target build every time |