Skip to content

Commit cacf79c

Browse files
committed
Improve PORT_PLUGINS cmake code
1 parent 8269fc5 commit cacf79c

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

python/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ MACRO(PY_2TO3 TARGET_NAME RESOURCE_PATHS)
5959
POST_BUILD
6060
COMMAND "${PYTHON_EXECUTABLE}" "${CMAKE_SOURCE_DIR}/scripts/2to3" --no-diffs -w ${RESOURCE_PATHS}
6161
WORKING_DIRECTORY "${CMAKE_BINARY_DIR}"
62-
COMMENT "Porting to Python 3 and Qt5"
62+
COMMENT "Porting ${RESOURCE_PATHS} to Python 3 and Qt5"
6363
)
6464
ENDMACRO(PY_2TO3)
6565

python/plugins/CMakeLists.txt

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

2021
MACRO (PLUGIN_INSTALL plugin subdir )

0 commit comments

Comments
 (0)