summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-05-31 16:36:13 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-05-31 18:10:46 +0200
commit04cc5a03d8bd6c170ec4ac17ab2edad1ded07285 (patch)
tree93903182efee9eee0f8640a629c2df90f1caea1a
parente708fab736117ddf36d0d02fee9927970863fb0c (diff)
downloadcmake-04cc5a03d8bd6c170ec4ac17ab2edad1ded07285.tar.gz
cmake-04cc5a03d8bd6c170ec4ac17ab2edad1ded07285.zip
Fix CMP0054 warnings with CMake 3.1r14.0.3r14.0.2r14.0.1
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit 1d8a7873c0e0660c58a2d0d7b054d216d5f06b0a)
-rw-r--r--modules/TDEMacros.cmake144
1 files changed, 72 insertions, 72 deletions
diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake
index dcf1f96..fec3163 100644
--- a/modules/TDEMacros.cmake
+++ b/modules/TDEMacros.cmake
@@ -575,113 +575,113 @@ macro( tde_add_library _arg_target )
unset( _skip_store )
# found one of directives: "SHARED", "STATIC", "MODULE"
- if( "${_arg}" STREQUAL "SHARED" OR "${_arg}" STREQUAL "STATIC" OR "${_arg}" STREQUAL "MODULE" )
+ if( "+${_arg}" STREQUAL "+SHARED" OR "+${_arg}" STREQUAL "+STATIC" OR "+${_arg}" STREQUAL "+MODULE" )
set( _skip_store 1 )
set( _type "${_arg}" )
- endif( "${_arg}" STREQUAL "SHARED" OR "${_arg}" STREQUAL "STATIC" OR "${_arg}" STREQUAL "MODULE" )
+ endif( "+${_arg}" STREQUAL "+SHARED" OR "+${_arg}" STREQUAL "+STATIC" OR "+${_arg}" STREQUAL "+MODULE" )
# found directive "STATIC_PIC"
- if( "${_arg}" STREQUAL "STATIC_PIC" )
+ if( "+${_arg}" STREQUAL "+STATIC_PIC" )
set( _skip_store 1 )
set( _type "STATIC" )
set( _static_pic 1 )
- endif( "${_arg}" STREQUAL "STATIC_PIC" )
+ endif( "+${_arg}" STREQUAL "+STATIC_PIC" )
# found directive "AUTOMOC"
- if( "${_arg}" STREQUAL "AUTOMOC" )
+ if( "+${_arg}" STREQUAL "+AUTOMOC" )
set( _skip_store 1 )
set( _automoc 1 )
- endif( "${_arg}" STREQUAL "AUTOMOC" )
+ endif( "+${_arg}" STREQUAL "+AUTOMOC" )
# found directive "META_INCLUDES"
- if( "${_arg}" STREQUAL "META_INCLUDES" )
+ if( "+${_arg}" STREQUAL "+META_INCLUDES" )
set( _skip_store 1 )
set( _storage "_meta_includes" )
endif( )
# found directive "NO_LIBTOOL_FILE"
- if( "${_arg}" STREQUAL "NO_LIBTOOL_FILE" )
+ if( "+${_arg}" STREQUAL "+NO_LIBTOOL_FILE" )
set( _skip_store 1 )
set( _no_libtool_file 1 )
- endif( "${_arg}" STREQUAL "NO_LIBTOOL_FILE" )
+ endif( "+${_arg}" STREQUAL "+NO_LIBTOOL_FILE" )
# found directive "NO_EXPORT"
- if( "${_arg}" STREQUAL "NO_EXPORT" )
+ if( "+${_arg}" STREQUAL "+NO_EXPORT" )
set( _skip_store 1 )
set( _no_export 1 )
- endif( "${_arg}" STREQUAL "NO_EXPORT" )
+ endif( "+${_arg}" STREQUAL "+NO_EXPORT" )
# found directive "VERSION"
- if( "${_arg}" STREQUAL "VERSION" )
+ if( "+${_arg}" STREQUAL "+VERSION" )
set( _skip_store 1 )
set( _storage "_version" )
- endif( "${_arg}" STREQUAL "VERSION" )
+ endif( "+${_arg}" STREQUAL "+VERSION" )
# found directive "SOURCES"
- if( "${_arg}" STREQUAL "SOURCES" )
+ if( "+${_arg}" STREQUAL "+SOURCES" )
set( _skip_store 1 )
set( _storage "_sources" )
- endif( "${_arg}" STREQUAL "SOURCES" )
+ endif( "+${_arg}" STREQUAL "+SOURCES" )
# found directive "EMBED"
- if( "${_arg}" STREQUAL "EMBED" )
+ if( "+${_arg}" STREQUAL "+EMBED" )
set( _skip_store 1 )
set( _storage "_embed" )
- endif( "${_arg}" STREQUAL "EMBED" )
+ endif( "+${_arg}" STREQUAL "+EMBED" )
# found directive "LINK"
- if( "${_arg}" STREQUAL "LINK" )
+ if( "+${_arg}" STREQUAL "+LINK" )
set( _skip_store 1 )
set( _storage "_link" )
- endif( "${_arg}" STREQUAL "LINK" )
+ endif( "+${_arg}" STREQUAL "+LINK" )
# found directive "DEPENDENCIES"
- if( "${_arg}" STREQUAL "DEPENDENCIES" )
+ if( "+${_arg}" STREQUAL "+DEPENDENCIES" )
set( _skip_store 1 )
set( _storage "_dependencies" )
- endif( "${_arg}" STREQUAL "DEPENDENCIES" )
+ endif( "+${_arg}" STREQUAL "+DEPENDENCIES" )
# found directive "DESTINATION"
- if( "${_arg}" STREQUAL "DESTINATION" )
+ if( "+${_arg}" STREQUAL "+DESTINATION" )
set( _skip_store 1 )
set( _storage "_destination" )
unset( ${_storage} )
- endif( "${_arg}" STREQUAL "DESTINATION" )
+ endif( "+${_arg}" STREQUAL "+DESTINATION" )
# metadata
- if( "${_arg}" STREQUAL "DESCRIPTION" )
+ if( "+${_arg}" STREQUAL "+DESCRIPTION" )
set( _skip_store 1 )
set( _storage "_description" )
endif( )
- if( "${_arg}" STREQUAL "LICENSE" )
+ if( "+${_arg}" STREQUAL "+LICENSE" )
set( _skip_store 1 )
set( _storage "_license" )
endif( )
- if( "${_arg}" STREQUAL "COPYRIGHT" )
+ if( "+${_arg}" STREQUAL "+COPYRIGHT" )
set( _skip_store 1 )
set( _storage "_copyright" )
endif( )
- if( "${_arg}" STREQUAL "AUTHORS" )
+ if( "+${_arg}" STREQUAL "+AUTHORS" )
set( _skip_store 1 )
set( _storage "_authors" )
endif( )
- if( "${_arg}" STREQUAL "PRODUCT" )
+ if( "+${_arg}" STREQUAL "+PRODUCT" )
set( _skip_store 1 )
set( _storage "_product" )
endif( )
- if( "${_arg}" STREQUAL "ORGANIZATION" )
+ if( "+${_arg}" STREQUAL "+ORGANIZATION" )
set( _skip_store 1 )
set( _storage "_organization" )
endif( )
- if( "${_arg}" STREQUAL "VERSION" )
+ if( "+${_arg}" STREQUAL "+VERSION" )
set( _skip_store 1 )
set( _storage "_version" )
endif( )
- if( "${_arg}" STREQUAL "DATETIME" )
+ if( "+${_arg}" STREQUAL "+DATETIME" )
set( _skip_store 1 )
set( _storage "_datetime" )
endif( )
- if( "${_arg}" STREQUAL "NOTES" )
+ if( "+${_arg}" STREQUAL "+NOTES" )
set( _skip_store 1 )
set( _storage "_notes" )
endif( )
@@ -912,82 +912,82 @@ macro( tde_add_executable _arg_target )
unset( _skip_store )
# found directive "AUTOMOC"
- if( "${_arg}" STREQUAL "AUTOMOC" )
+ if( "+${_arg}" STREQUAL "+AUTOMOC" )
set( _skip_store 1 )
set( _automoc 1 )
- endif( "${_arg}" STREQUAL "AUTOMOC" )
+ endif( "+${_arg}" STREQUAL "+AUTOMOC" )
# found directive "META_INCLUDES"
- if( "${_arg}" STREQUAL "META_INCLUDES" )
+ if( "+${_arg}" STREQUAL "+META_INCLUDES" )
set( _skip_store 1 )
set( _storage "_meta_includes" )
endif( )
# found directive "SETUID"
- if( "${_arg}" STREQUAL "SETUID" )
+ if( "+${_arg}" STREQUAL "+SETUID" )
set( _skip_store 1 )
set( _setuid 1 )
- endif( "${_arg}" STREQUAL "SETUID" )
+ endif( "+${_arg}" STREQUAL "+SETUID" )
# found directive "SOURCES"
- if( "${_arg}" STREQUAL "SOURCES" )
+ if( "+${_arg}" STREQUAL "+SOURCES" )
set( _skip_store 1 )
set( _storage "_sources" )
- endif( "${_arg}" STREQUAL "SOURCES" )
+ endif( "+${_arg}" STREQUAL "+SOURCES" )
# found directive "LINK"
- if( "${_arg}" STREQUAL "LINK" )
+ if( "+${_arg}" STREQUAL "+LINK" )
set( _skip_store 1 )
set( _storage "_link" )
- endif( "${_arg}" STREQUAL "LINK" )
+ endif( "+${_arg}" STREQUAL "+LINK" )
# found directive "DEPENDENCIES"
- if( "${_arg}" STREQUAL "DEPENDENCIES" )
+ if( "+${_arg}" STREQUAL "+DEPENDENCIES" )
set( _skip_store 1 )
set( _storage "_dependencies" )
- endif( "${_arg}" STREQUAL "DEPENDENCIES" )
+ endif( "+${_arg}" STREQUAL "+DEPENDENCIES" )
# found directive "DESTINATION"
- if( "${_arg}" STREQUAL "DESTINATION" )
+ if( "+${_arg}" STREQUAL "+DESTINATION" )
set( _skip_store 1 )
set( _storage "_destination" )
unset( ${_storage} )
- endif( "${_arg}" STREQUAL "DESTINATION" )
+ endif( "+${_arg}" STREQUAL "+DESTINATION" )
# metadata
- if( "${_arg}" STREQUAL "DESCRIPTION" )
+ if( "+${_arg}" STREQUAL "+DESCRIPTION" )
set( _skip_store 1 )
set( _storage "_description" )
endif( )
- if( "${_arg}" STREQUAL "LICENSE" )
+ if( "+${_arg}" STREQUAL "+LICENSE" )
set( _skip_store 1 )
set( _storage "_license" )
endif( )
- if( "${_arg}" STREQUAL "COPYRIGHT" )
+ if( "+${_arg}" STREQUAL "+COPYRIGHT" )
set( _skip_store 1 )
set( _storage "_copyright" )
endif( )
- if( "${_arg}" STREQUAL "AUTHORS" )
+ if( "+${_arg}" STREQUAL "+AUTHORS" )
set( _skip_store 1 )
set( _storage "_authors" )
endif( )
- if( "${_arg}" STREQUAL "PRODUCT" )
+ if( "+${_arg}" STREQUAL "+PRODUCT" )
set( _skip_store 1 )
set( _storage "_product" )
endif( )
- if( "${_arg}" STREQUAL "ORGANIZATION" )
+ if( "+${_arg}" STREQUAL "+ORGANIZATION" )
set( _skip_store 1 )
set( _storage "_organization" )
endif( )
- if( "${_arg}" STREQUAL "VERSION" )
+ if( "+${_arg}" STREQUAL "+VERSION" )
set( _skip_store 1 )
set( _storage "_version" )
endif( )
- if( "${_arg}" STREQUAL "DATETIME" )
+ if( "+${_arg}" STREQUAL "+DATETIME" )
set( _skip_store 1 )
set( _storage "_datetime" )
endif( )
- if( "${_arg}" STREQUAL "NOTES" )
+ if( "+${_arg}" STREQUAL "+NOTES" )
set( _skip_store 1 )
set( _storage "_notes" )
endif( )
@@ -1086,31 +1086,31 @@ macro( tde_add_tdeinit_executable _target )
unset( _skip_store )
# found directive "EXPORT"
- if( "${_arg}" STREQUAL "EXPORT" )
+ if( "+${_arg}" STREQUAL "+EXPORT" )
set( _skip_store 1 )
unset( _export )
- endif( "${_arg}" STREQUAL "EXPORT" )
+ endif( "+${_arg}" STREQUAL "+EXPORT" )
# found directive "RUNTIME_DESTINATION"
- if( "${_arg}" STREQUAL "RUNTIME_DESTINATION" )
+ if( "+${_arg}" STREQUAL "+RUNTIME_DESTINATION" )
set( _skip_store 1 )
set( _storage "_runtime_destination" )
unset( ${_storage} )
- endif( "${_arg}" STREQUAL "RUNTIME_DESTINATION" )
+ endif( "+${_arg}" STREQUAL "+RUNTIME_DESTINATION" )
# found directive "LIBRARY_DESTINATION"
- if( "${_arg}" STREQUAL "LIBRARY_DESTINATION" )
+ if( "+${_arg}" STREQUAL "+LIBRARY_DESTINATION" )
set( _skip_store 1 )
set( _storage "_library_destination" )
unset( ${_storage} )
- endif( "${_arg}" STREQUAL "LIBRARY_DESTINATION" )
+ endif( "+${_arg}" STREQUAL "+LIBRARY_DESTINATION" )
# found directive "PLUGIN_DESTINATION"
- if( "${_arg}" STREQUAL "PLUGIN_DESTINATION" )
+ if( "+${_arg}" STREQUAL "+PLUGIN_DESTINATION" )
set( _skip_store 1 )
set( _storage "_plugin_destination" )
unset( ${_storage} )
- endif( "${_arg}" STREQUAL "PLUGIN_DESTINATION" )
+ endif( "+${_arg}" STREQUAL "+PLUGIN_DESTINATION" )
# storing value
if( _storage AND NOT _skip_store )
@@ -1171,28 +1171,28 @@ macro( tde_create_translation )
foreach( _arg ${ARGN} )
# found directive "FILES"
- if( "${_arg}" STREQUAL "FILES" )
+ if( "+${_arg}" STREQUAL "+FILES" )
unset( _srcs )
set( _var _srcs )
set( _directive 1 )
endif( )
# found directive "LANG"
- if( "${_arg}" STREQUAL "LANG" )
+ if( "+${_arg}" STREQUAL "+LANG" )
unset( _lang )
set( _var _lang )
set( _directive 1 )
endif( )
# found directive "DESTINATION"
- if( "${_arg}" STREQUAL "DESTINATION" )
+ if( "+${_arg}" STREQUAL "+DESTINATION" )
unset( _dest )
set( _var _dest )
set( _directive 1 )
endif( )
# found directive "DESTINATION"
- if( "${_arg}" STREQUAL "OUTPUT_NAME" )
+ if( "+${_arg}" STREQUAL "+OUTPUT_NAME" )
unset( _proj )
set( _var _out_name )
set( _directive 1 )
@@ -1291,41 +1291,41 @@ macro( tde_create_handbook )
foreach( _arg ${ARGN} )
# found directive "NOINDEX"
- if( "${_arg}" STREQUAL "NOINDEX" )
+ if( "+${_arg}" STREQUAL "+NOINDEX" )
set( _noindex 1 )
set( _directive 1 )
endif()
# found directive "FILES"
- if( "${_arg}" STREQUAL "FILES" )
+ if( "+${_arg}" STREQUAL "+FILES" )
unset( _srcs )
set( _var _srcs )
set( _directive 1 )
endif()
# found directive "EXTRA"
- if( "${_arg}" STREQUAL "EXTRA" )
+ if( "+${_arg}" STREQUAL "+EXTRA" )
unset( _extra )
set( _var _extra )
set( _directive 1 )
endif()
# found directive "SRCDIR"
- if( "${_arg}" STREQUAL "SRCDIR" )
+ if( "+${_arg}" STREQUAL "+SRCDIR" )
unset( _srcdir )
set( _var _srcdir )
set( _directive 1 )
endif()
# found directive DESTINATION
- if( _arg STREQUAL "DESTINATION" )
+ if( "+${_arg}" STREQUAL "+DESTINATION" )
unset( _dest )
set( _var _dest )
set( _directive 1 )
endif()
# found directive "LANG"
- if( "${_arg}" STREQUAL "LANG" )
+ if( "+${_arg}" STREQUAL "+LANG" )
unset( _lang )
set( _var _lang )
set( _directive 1 )