diff options
| -rw-r--r-- | lldb/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | lldb/source/CMakeLists.txt | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/lldb/CMakeLists.txt b/lldb/CMakeLists.txt index 65c5b2ab968..efc866dad6c 100644 --- a/lldb/CMakeLists.txt +++ b/lldb/CMakeLists.txt @@ -375,3 +375,13 @@ endif () add_subdirectory(source) add_subdirectory(test) add_subdirectory(tools) + + +if ( LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION AND NOT LLDB_DISABLE_PYTHON ) + # Add a Post-Build Event to copy over Python files and create the symlink to liblldb.so for the Python API(hardlink on Windows) + add_custom_target( finish_swig ALL + 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 + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/scripts/finishSwigWrapperClasses.py + COMMENT "Python script sym-linking LLDB Python API") + add_dependencies(finish_swig liblldb argdumper) +endif () diff --git a/lldb/source/CMakeLists.txt b/lldb/source/CMakeLists.txt index 8c9c7526ae2..ee97a8c1afd 100644 --- a/lldb/source/CMakeLists.txt +++ b/lldb/source/CMakeLists.txt @@ -65,6 +65,7 @@ endif() if (LLDB_WRAP_PYTHON OR LLDB_VERS_GENERATED_FILE) add_dependencies(liblldb swig_wrapper) + message("Adding dependency on swig_wrapper") endif() target_link_libraries(liblldb ${cmake_2_8_12_PRIVATE} ${LLDB_SYSTEM_LIBS}) @@ -94,17 +95,6 @@ endif () # FIXME: implement svn/git revision and repository parsing solution on Windows. There is an SVN-only # revision parsing solution in tools/clang/lib/Basic/CMakelists.txt. -if ( LLDB_ENABLE_PYTHON_SCRIPTS_SWIG_API_GENERATION ) - # Add a Post-Build Event to copy over Python files and create the symlink to liblldb.so for the Python API(hardlink on Windows) - if ( NOT LLDB_DISABLE_PYTHON ) - add_custom_command( TARGET liblldb - POST_BUILD - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../scripts/finishSwigWrapperClasses.py - 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 () - install(TARGETS liblldb RUNTIME DESTINATION bin LIBRARY DESTINATION lib${LLVM_LIBDIR_SUFFIX} |
