Improve PORT_PLUGINS cmake code

qgis · Apr 15, 2016 · cacf79c · cacf79c
1 parent 8269fc5
commit cacf79c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/python/CMakeLists.txt b/python/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)
 

diff --git a/python/plugins/CMakeLists.txt b/python/plugins/CMakeLists.txt
@@ -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 )