Skip to content

Commit 6dfdb85

Browse files
committed
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
2 parents fc7a5f7 + d779b43 commit 6dfdb85

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

CMake/ctkMacroBuildQtPlugin.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,13 +165,12 @@ macro(ctkMacroBuildQtPlugin)
165165
# subdirectory (e.g. 'designer') but not deeper (e.g. designer/Debug), let's copy them.
166166

167167
if(NOT CMAKE_CFG_INTDIR STREQUAL ".")
168-
get_target_property(FILE_PATH ${lib_name} LOCATION)
169168
get_target_property(DIR_PATH ${lib_name} LIBRARY_OUTPUT_DIRECTORY)
170169

171170
add_custom_command(
172171
TARGET ${lib_name}
173172
POST_BUILD
174-
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}
173+
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}
175174
)
176175
endif()
177176

CMake/ctkMacroCheckExternalProjectDependency.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ endfunction()
342342
#!
343343
function(ExternalProject_Message proj msg)
344344
set(_display 1)
345-
if("${ARGV2}" MATCHES ".+")
345+
if(NOT "x${ARGV2}" STREQUAL "x")
346346
set(_display ${ARGN})
347347
endif()
348348
if(${_display})

0 commit comments

Comments
 (0)