diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/ECMAddTests.cmake | 9 | ||||
| -rw-r--r-- | modules/ECMGenerateDBusServiceFile.cmake | 2 | ||||
| -rwxr-xr-x | modules/check-outbound-license.py | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/modules/ECMAddTests.cmake b/modules/ECMAddTests.cmake index 4bc7fb8b..7e518212 100644 --- a/modules/ECMAddTests.cmake +++ b/modules/ECMAddTests.cmake @@ -94,13 +94,14 @@ function(ecm_add_test) target_link_libraries(${_targetname} ${ARG_LINK_LIBRARIES}) ecm_mark_as_test(${_targetname}) if (CMAKE_LIBRARY_OUTPUT_DIRECTORY) - if(CMAKE_HOST_SYSTEM MATCHES "Windows") - set(PATHSEP ";") + if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows") + # https://stackoverflow.com/questions/59862894/how-do-i-make-a-list-in-cmake-with-the-semicolon-value + set(PATHSEP "\\\;") # Don't want cmake to treat it like a list else() # e.g. Linux set(PATHSEP ":") endif() - set(_plugin_path $ENV{QT_PLUGIN_PATH}) - set_property(TEST ${_testname} PROPERTY ENVIRONMENT QT_PLUGIN_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}${PATHSEP}${_plugin_path}) + set(_plugin_path "$ENV{QT_PLUGIN_PATH}") + set_property(TEST ${_testname} PROPERTY ENVIRONMENT "QT_PLUGIN_PATH=${CMAKE_LIBRARY_OUTPUT_DIRECTORY}${PATHSEP}${_plugin_path}") endif() if (ARG_TARGET_NAME_VAR) set(${ARG_TARGET_NAME_VAR} "${_targetname}" PARENT_SCOPE) diff --git a/modules/ECMGenerateDBusServiceFile.cmake b/modules/ECMGenerateDBusServiceFile.cmake index eabc1b42..12c37c7b 100644 --- a/modules/ECMGenerateDBusServiceFile.cmake +++ b/modules/ECMGenerateDBusServiceFile.cmake @@ -12,7 +12,7 @@ # EXECUTABLE <executable> # [SYSTEMD_SERVICE <systemd service>] # DESTINATION <install_path> -# [RENAME <dbus service filename>] +# [RENAME <dbus service filename>] # Since 5.75 # ) # # A D-Bus service file ``<service name>.service`` will be generated and installed diff --git a/modules/check-outbound-license.py b/modules/check-outbound-license.py index b8c1ef23..2657e628 100755 --- a/modules/check-outbound-license.py +++ b/modules/check-outbound-license.py @@ -125,15 +125,15 @@ if __name__ == '__main__': spdxDictionary[fileName] = licenses fileName = "" licenses = [] - f.close(); + f.close() # read file with list of test files f = open(args.input, "r") testfiles = f.readlines() f.close() - if check_outbound_license(args.license, testfiles, spdxDictionary) == True: - sys.exit(0); + if check_outbound_license(args.license, testfiles, spdxDictionary) is True: + sys.exit(0) # in any other case, return error code sys.exit(1) |