Преглед на файлове

Merge branch 'fix-cmake-3.x-warnings'

* fix-cmake-3.x-warnings:
  Update ctkMacroBuildQtPlugin to fix CMake warning related to CMP0026
  Update ExternalProjectDependency based on commontk/Artichoke@388fc33
Jean-Christophe Fillion-Robin преди 10 години
родител
ревизия
6dfdb85fd4
променени са 2 файла, в които са добавени 2 реда и са изтрити 3 реда
  1. 1 2
      CMake/ctkMacroBuildQtPlugin.cmake
  2. 1 1
      CMake/ctkMacroCheckExternalProjectDependency.cmake

+ 1 - 2
CMake/ctkMacroBuildQtPlugin.cmake

@@ -165,13 +165,12 @@ macro(ctkMacroBuildQtPlugin)
   # subdirectory (e.g. 'designer') but not deeper (e.g. designer/Debug), let's copy them.
 
   if(NOT CMAKE_CFG_INTDIR STREQUAL ".")
-    get_target_property(FILE_PATH ${lib_name} LOCATION)
     get_target_property(DIR_PATH ${lib_name} LIBRARY_OUTPUT_DIRECTORY)
 
     add_custom_command(
       TARGET ${lib_name}
       POST_BUILD
-      COMMAND ${CMAKE_COMMAND} -E copy ${FILE_PATH} ${DIR_PATH}/../${MY_PLUGIN_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${lib_name}${CMAKE_BUILD_TYPE}${CMAKE_SHARED_LIBRARY_SUFFIX}
+      COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE> ${DIR_PATH}/../${MY_PLUGIN_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}${lib_name}${CMAKE_BUILD_TYPE}${CMAKE_SHARED_LIBRARY_SUFFIX}
       )
   endif()
 

+ 1 - 1
CMake/ctkMacroCheckExternalProjectDependency.cmake

@@ -342,7 +342,7 @@ endfunction()
 #!
 function(ExternalProject_Message proj msg)
   set(_display 1)
-  if("${ARGV2}" MATCHES ".+")
+  if(NOT "x${ARGV2}" STREQUAL "x")
     set(_display ${ARGN})
   endif()
   if(${_display})