[Lldb-commits] [lldb] r213354 - Use the designated PYTHON_EXECUTABLE during build.

[Zachary Turner]

Author: zturner
Date: Fri Jul 18 02:06:13 2014
New Revision: 213354

URL: http://llvm.org/viewvc/llvm-project?rev=213354&view=rev
Log:
Use the designated PYTHON_EXECUTABLE during build.

We were hardcoding "python" as the command to run the swig wrapper
scripts.  We should be using PYTHON_EXECUTABLE instead.

Modified:
    lldb/trunk/scripts/CMakeLists.txt
    lldb/trunk/source/CMakeLists.txt

Modified: lldb/trunk/scripts/CMakeLists.txt
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/CMakeLists.txt?rev=213354&r1=213353&r2=213354&view=diff
==============================================================================
--- lldb/trunk/scripts/CMakeLists.txt (original)
+++ lldb/trunk/scripts/CMakeLists.txt Fri Jul 18 02:06:13 2014
@@ -8,7 +8,7 @@ if ( LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API
          DEPENDS ${LLDB_SOURCE_DIR}/scripts/lldb.swig
          DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/buildSwigWrapperClasses.py
          DEPENDS ${SWIG_INPUTS}  
-         COMMAND python ${CMAKE_CURRENT_SOURCE_DIR}/buildSwigWrapperClasses.py 
"--srcRoot=${LLDB_SOURCE_DIR}" "--targetDir=${CMAKE_CURRENT_BINARY_DIR}" 
"--cfgBldDir=${CMAKE_CURRENT_BINARY_DIR}" "--prefix=${CMAKE_BINARY_DIR}" -m    
+         COMMAND ${PYTHON_EXECUTABLE} 
${CMAKE_CURRENT_SOURCE_DIR}/buildSwigWrapperClasses.py 
"--srcRoot=${LLDB_SOURCE_DIR}" "--targetDir=${CMAKE_CURRENT_BINARY_DIR}" 
"--cfgBldDir=${CMAKE_CURRENT_BINARY_DIR}" "--prefix=${CMAKE_BINARY_DIR}" -m    
          COMMENT "Python script building LLDB Python wrapper")  
        
set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/LLDBWrapPython.cpp 
PROPERTIES GENERATED 1)
 

Modified: lldb/trunk/source/CMakeLists.txt
URL: 
http://llvm.org/viewvc/llvm-project/lldb/trunk/source/CMakeLists.txt?rev=213354&r1=213353&r2=213354&view=diff
==============================================================================
--- lldb/trunk/source/CMakeLists.txt (original)
+++ lldb/trunk/source/CMakeLists.txt Fri Jul 18 02:06:13 2014
@@ -335,7 +335,7 @@ if ( LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API
            add_custom_command( TARGET liblldb
                POST_BUILD
             DEPENDS 
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/finishSwigWrapperClasses.py
-               COMMAND python 
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/finishSwigWrapperClasses.py 
--buildConfig=${CMAKE_BUILD_TYPE} "--srcRoot=${LLDB_SOURCE_DIR}" 
"--targetDir=${CMAKE_CURRENT_BINARY_DIR}/../scripts" 
"--cfgBldDir=${CMAKE_CURRENT_BINARY_DIR}/../scripts" 
"--prefix=${CMAKE_BINARY_DIR}" "--cmakeBuildConfiguration=${CMAKE_CFG_INTDIR}" 
-m
+               COMMAND ${PYTHON_EXECUTABLE} 
${CMAKE_CURRENT_SOURCE_DIR}/../scripts/finishSwigWrapperClasses.py 
--buildConfig=${CMAKE_BUILD_TYPE} "--srcRoot=${LLDB_SOURCE_DIR}" 
"--targetDir=${CMAKE_CURRENT_BINARY_DIR}/../scripts" 
"--cfgBldDir=${CMAKE_CURRENT_BINARY_DIR}/../scripts" 
"--prefix=${CMAKE_BINARY_DIR}" "--cmakeBuildConfiguration=${CMAKE_CFG_INTDIR}" 
-m
                COMMENT "Python script sym-linking LLDB Python API")
        endif ()
 endif ()


_______________________________________________
lldb-commits mailing list
lldb-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/lldb-commits