Skip to content
Permalink
Browse files

Improve PORT_PLUGINS cmake code

  • Loading branch information
m-kuhn committed Apr 15, 2016
1 parent 8269fc5 commit cacf79cd9655cbfb55d0ebc5f19f635ed9cccc8d
Showing with 4 additions and 3 deletions.
  1. +1 −1 python/CMakeLists.txt
  2. +3 −2 python/plugins/CMakeLists.txt
@@ -59,7 +59,7 @@ MACRO(PY_2TO3 TARGET_NAME RESOURCE_PATHS)
POST_BUILD
COMMAND "${PYTHON_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/scripts/2to3" --no-diffs -w ${RESOURCE_PATHS}
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
COMMENT "Porting to Python 3 and Qt5"
COMMENT "Porting ${RESOURCE_PATHS} to Python 3 and Qt5"
)
ENDMACRO(PY_2TO3)

@@ -11,10 +11,11 @@ FILE(WRITE ${CMAKE_BINARY_DIR}/stagecount 0)
# The target port-plugins acts as a container for all port-plugin-XXX targets
# Each port-plugin-XXX target will run scripts/2to3 on a plugin and migrate
# Python 3 and Qt 5 code.
ADD_CUSTOM_TARGET(port-plugins)
SET (PORT_PLUGINS FALSE CACHE BOOL "Determines whether python plugins in staged or installed locations should be migrated to Python 3 and Qt 5")
IF(PORT_PLUGINS)
ADD_CUSTOM_TARGET(port-plugins-on-build ALL DEPENDS port-plugins)
ADD_CUSTOM_TARGET(port-plugins ALL)
ELSE(PORT_PLUGINS)
ADD_CUSTOM_TARGET(port-plugins)
ENDIF(PORT_PLUGINS)

MACRO (PLUGIN_INSTALL plugin subdir )

0 comments on commit cacf79c

Please sign in to comment.
You can’t perform that action at this time.