diff options
| author | Jon Ashburn <jon@lunarg.com> | 2015-03-18 09:29:11 -0600 |
|---|---|---|
| committer | Jon Ashburn <jon@lunarg.com> | 2015-03-18 11:57:39 -0600 |
| commit | 9266a13b199e42462b88afb6385a5fbd9ffaf529 (patch) | |
| tree | af3bd8668a1c59938b4dd2efd3b815abec23dbfd | |
| parent | 8b12a1fc0faea924bff2341625c1ee6f95ffdf28 (diff) | |
| download | usermoji-9266a13b199e42462b88afb6385a5fbd9ffaf529.tar.xz | |
win: Make build able to find python3 on Windows and Linux
Use the py launcher on Windows which understands she bangs
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | icd/nulldrv/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | layers/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | loader/CMakeLists.txt | 4 |
4 files changed, 13 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 762919a1..25a91f6c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,11 @@ if (NOT WIN32) if(NOT EXISTS ${LUNARGLASS_PREFIX}) message(FATAL_ERROR "Necessary LunarGLASS components do not exist: " ${GLSLANG_PREFIX}) endif() + if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") + set(PYTHON_CMD "python3") + endif() +else() + set(PYTHON_CMD "py") endif() # loader: Generic XGL ICD loader diff --git a/icd/nulldrv/CMakeLists.txt b/icd/nulldrv/CMakeLists.txt index b11840b6..a0686d35 100644 --- a/icd/nulldrv/CMakeLists.txt +++ b/icd/nulldrv/CMakeLists.txt @@ -3,7 +3,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DXGL_PROTOTYPES") add_custom_command(OUTPUT nulldrv_gpa.c - COMMAND ${PROJECT_SOURCE_DIR}/xgl-generate.py icd-get-proc-addr > nulldrv_gpa.c + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/xgl-generate.py icd-get-proc-addr > nulldrv_gpa.c DEPENDS ${PROJECT_SOURCE_DIR}/xgl-generate.py ${PROJECT_SOURCE_DIR}/xgl.py) set(sources diff --git a/layers/CMakeLists.txt b/layers/CMakeLists.txt index 7ad4c17f..e066b93f 100644 --- a/layers/CMakeLists.txt +++ b/layers/CMakeLists.txt @@ -2,14 +2,14 @@ cmake_minimum_required (VERSION 2.8.11) macro(run_xgl_helper subcmd) add_custom_command(OUTPUT ${ARGN} - COMMAND ${PROJECT_SOURCE_DIR}/xgl_helper.py --${subcmd} ${PROJECT_SOURCE_DIR}/include/xgl.h --abs_out_dir ${CMAKE_CURRENT_BINARY_DIR} + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/xgl_helper.py --${subcmd} ${PROJECT_SOURCE_DIR}/include/xgl.h --abs_out_dir ${CMAKE_CURRENT_BINARY_DIR} DEPENDS ${PROJECT_SOURCE_DIR}/xgl_helper.py ${PROJECT_SOURCE_DIR}/include/xgl.h ) endmacro() macro(run_xgl_layer_generate subcmd output) add_custom_command(OUTPUT ${output} - COMMAND ${PROJECT_SOURCE_DIR}/xgl-layer-generate.py ${subcmd} ${PROJECT_SOURCE_DIR}/include/xgl.h > ${output} + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/xgl-layer-generate.py ${subcmd} ${PROJECT_SOURCE_DIR}/include/xgl.h > ${output} DEPENDS ${PROJECT_SOURCE_DIR}/xgl-layer-generate.py ${PROJECT_SOURCE_DIR}/include/xgl.h ${PROJECT_SOURCE_DIR}/xgl.py ) endmacro() @@ -17,7 +17,7 @@ endmacro() if (WIN32) macro(add_xgl_layer target) add_custom_command(OUTPUT XGLLayer${target}.def - COMMAND ${PROJECT_SOURCE_DIR}/xgl-win-def-file-generate.py ${target} > XGLLayer${target}.def + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/xgl-win-def-file-generate.py ${target} > XGLLayer${target}.def DEPENDS ${PROJECT_SOURCE_DIR}/xgl-win-def-file-generate.py ) add_library(XGLLayer${target} SHARED ${ARGN} XGLLayer${target}.def) @@ -52,11 +52,11 @@ if (NOT WIN32) endif() add_custom_command(OUTPUT xgl_dispatch_table_helper.h - COMMAND ${PROJECT_SOURCE_DIR}/xgl-generate.py dispatch-table-ops layer > xgl_dispatch_table_helper.h + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/xgl-generate.py dispatch-table-ops layer > xgl_dispatch_table_helper.h DEPENDS ${PROJECT_SOURCE_DIR}/xgl-generate.py ${PROJECT_SOURCE_DIR}/xgl.py) add_custom_command(OUTPUT xgl_generic_intercept_proc_helper.h - COMMAND ${PROJECT_SOURCE_DIR}/xgl-generate.py layer-intercept-proc > xgl_generic_intercept_proc_helper.h + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/xgl-generate.py layer-intercept-proc > xgl_generic_intercept_proc_helper.h DEPENDS ${PROJECT_SOURCE_DIR}/xgl-generate.py ${PROJECT_SOURCE_DIR}/xgl.py) run_xgl_helper(gen_enum_string_helper xgl_enum_string_helper.h) diff --git a/loader/CMakeLists.txt b/loader/CMakeLists.txt index 697d0304..66c80186 100644 --- a/loader/CMakeLists.txt +++ b/loader/CMakeLists.txt @@ -1,10 +1,10 @@ add_custom_command(OUTPUT dispatch.c - COMMAND ${PROJECT_SOURCE_DIR}/xgl-generate.py loader-entrypoints > dispatch.c + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/xgl-generate.py loader-entrypoints > dispatch.c DEPENDS ${PROJECT_SOURCE_DIR}/xgl-generate.py ${PROJECT_SOURCE_DIR}/xgl.py ${PROJECT_SOURCE_DIR}/include/xglIcd.h) add_custom_command(OUTPUT table_ops.h - COMMAND ${PROJECT_SOURCE_DIR}/xgl-generate.py dispatch-table-ops loader > table_ops.h + COMMAND ${PYTHON_CMD} ${PROJECT_SOURCE_DIR}/xgl-generate.py dispatch-table-ops loader > table_ops.h DEPENDS ${PROJECT_SOURCE_DIR}/xgl-generate.py ${PROJECT_SOURCE_DIR}/xgl.py) include_directories( |