diff options
| author | Jukka Jylänki <jujjyl@gmail.com> | 2013-09-03 15:27:54 +0300 |
|---|---|---|
| committer | Jukka Jylänki <jujjyl@gmail.com> | 2013-09-04 10:42:01 +0300 |
| commit | d3efee5a9016f9af9d85eaaa18815be5b0ed2499 (patch) | |
| tree | 710bf3de1884dd0e4c1a5b9f9c539447e1ec9941 /tests/test_other.py | |
| parent | a5f8358b108fe041741650c980d2252e0dc99897 (diff) | |
Delete Emscripten_unix.cmake, the previous commit makes that obsolete!
Diffstat (limited to 'tests/test_other.py')
| -rw-r--r-- | tests/test_other.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tests/test_other.py b/tests/test_other.py index 956dfa41..f763a302 100644 --- a/tests/test_other.py +++ b/tests/test_other.py @@ -282,11 +282,9 @@ f.close() if os.name == 'nt': make_command = 'mingw32-make' generator = 'MinGW Makefiles' - emscriptencmaketoolchain = path_from_root('cmake', 'Platform', 'Emscripten.cmake') else: make_command = 'make' generator = 'Unix Makefiles' - emscriptencmaketoolchain = path_from_root('cmake', 'Platform', 'Emscripten_unix.cmake') cmake_cases = ['target_js', 'target_html'] cmake_outputs = ['hello_world.js', 'hello_world_gles.html'] @@ -301,7 +299,7 @@ f.close() verbose = int(os.getenv('EM_BUILD_VERBOSE')) != 0 # Run Cmake - cmd = ['cmake', '-DCMAKE_TOOLCHAIN_FILE='+emscriptencmaketoolchain, + cmd = ['cmake', '-DCMAKE_TOOLCHAIN_FILE='+path_from_root('cmake', 'Platform', 'Emscripten.cmake'), '-DCMAKE_BUILD_TYPE=' + configuration, '-DCMAKE_MODULE_PATH=' + path_from_root('cmake').replace('\\', '/'), '-G', generator, cmakelistsdir] |