diff options
| author | Jonas Platte <mail@jonasplatte.de> | 2014-06-27 13:59:43 +0200 |
|---|---|---|
| committer | Jonas Platte <mail@jonasplatte.de> | 2014-06-27 14:17:51 +0200 |
| commit | e3cf0ef1e9f912fe7eb3403e91e3df888b4df06b (patch) | |
| tree | 762c0a949f7b96669be545d9a0a4f46882a8136f | |
| parent | 27a0399fa393cc5ee02c863c7a57170902bc692d (diff) | |
Fix CMAKE_FIND_ROOT_PATH
This allows projects and libraries using CMake to automatically find include directories and library files in the emscripten system directory. I am unsure why it was set to `${EMSCRIPTEN_ROOT_PATH}/cmake` before, but I tested it and it didn't work until I changed `cmake` to `system`. `CMAKE_FIND_ROOT_PATH` is documented [here](http://www.cmake.org/Wiki/CMake_Cross_Compiling#Searching_and_finding_external_software).
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | cmake/Platform/Emscripten.cmake | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -146,3 +146,4 @@ a license to everyone to use it as detailed in LICENSE.) * Nicolas Guillemot <nlguillemot@gmail.com> * Sathyanarayanan Gunasekaran <gsathya.ceg@gmail.com> (copyright owned by Mozilla Foundation) * Nikolay Vorobyov <nik.vorobyov@gmail.com> +* Jonas Platte <mail@jonasplatte.de> diff --git a/cmake/Platform/Emscripten.cmake b/cmake/Platform/Emscripten.cmake index 362a552d..55329639 100644 --- a/cmake/Platform/Emscripten.cmake +++ b/cmake/Platform/Emscripten.cmake @@ -49,7 +49,7 @@ if (NOT CMAKE_MODULE_PATH) endif() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${EMSCRIPTEN_ROOT_PATH}/cmake/Modules") -set(CMAKE_FIND_ROOT_PATH "${EMSCRIPTEN_ROOT_PATH}/cmake") +set(CMAKE_FIND_ROOT_PATH "${EMSCRIPTEN_ROOT_PATH}/system") if (CMAKE_HOST_WIN32) set(EMCC_SUFFIX ".bat") |