From cf171f179d2aee3f73d737200d1bf7541304bd32 Mon Sep 17 00:00:00 2001 From: Alan Garny Date: Fri, 18 Oct 2019 11:07:23 +1300 Subject: [PATCH] Some minor cleaning up. --- CMakeLists.txt | 15 +++++---------- cmake/common.cmake | 3 +-- run.vbs | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 79e33c478a..02ed6cf327 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -620,10 +620,8 @@ track_files(${VERSION_DATE_FILENAME}) set(COMMON_QRC_FILENAME ${PROJECT_BUILD_DIR}/res/common.qrc) set(I18N_QRC_FILENAME ${PROJECT_BUILD_DIR}/res/i18n.qrc) -configure_file(${CMAKE_SOURCE_DIR}/res/common.qrc.in - ${COMMON_QRC_FILENAME}) -configure_file(${CMAKE_SOURCE_DIR}/res/i18n.qrc.in - ${I18N_QRC_FILENAME}) +configure_file(${CMAKE_SOURCE_DIR}/res/common.qrc.in ${COMMON_QRC_FILENAME}) +configure_file(${CMAKE_SOURCE_DIR}/res/i18n.qrc.in ${I18N_QRC_FILENAME}) # Files that make up the GUI version of OpenCOR @@ -748,8 +746,7 @@ string(TIMESTAMP YEAR "%Y") if(WIN32) set(RC_FILENAME ${PROJECT_BUILD_DIR}/${CMAKE_PROJECT_NAME}.rc) - configure_file(${CMAKE_SOURCE_DIR}/res/${CMAKE_PROJECT_NAME}.rc.in - ${RC_FILENAME}) + configure_file(${CMAKE_SOURCE_DIR}/res/${CMAKE_PROJECT_NAME}.rc.in ${RC_FILENAME}) list(APPEND SOURCES ${RC_FILENAME}) elseif(APPLE) @@ -789,8 +786,7 @@ if(ENABLE_TESTS) set(TESTS_QRC_FILENAME ${PROJECT_BUILD_DIR}/src/tests/res/tests.qrc) - configure_file(${CMAKE_SOURCE_DIR}/src/tests/res/tests.qrc.in - ${TESTS_QRC_FILENAME}) + configure_file(${CMAKE_SOURCE_DIR}/src/tests/res/tests.qrc.in ${TESTS_QRC_FILENAME}) add_executable(${RUNTESTS_NAME} src/tests/src/main.cpp @@ -1416,8 +1412,7 @@ endif() set(NOTICE_FILENAME ${PROJECT_BUILD_DIR}/NOTICE.txt) -configure_file(${CMAKE_SOURCE_DIR}/NOTICE.txt.in - ${NOTICE_FILENAME}) +configure_file(${CMAKE_SOURCE_DIR}/NOTICE.txt.in ${NOTICE_FILENAME}) set(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt diff --git a/cmake/common.cmake b/cmake/common.cmake index 3f21d77079..65b6134391 100644 --- a/cmake/common.cmake +++ b/cmake/common.cmake @@ -208,8 +208,7 @@ macro(add_plugin PLUGIN_NAME) string(REPLACE "${CMAKE_SOURCE_DIR}" "${PROJECT_BUILD_DIR}" I18N_QRC_FILENAME "${PROJECT_SOURCE_DIR}/res/${PLUGIN_NAME}_i18n.qrc") - configure_file(${I18N_QRC_IN_FILENAME} - ${I18N_QRC_FILENAME}) + configure_file(${I18N_QRC_IN_FILENAME} ${I18N_QRC_FILENAME}) list(APPEND RESOURCES ${I18N_QRC_FILENAME}) diff --git a/run.vbs b/run.vbs index 6391da46de..631c165c82 100644 --- a/run.vbs +++ b/run.vbs @@ -1,6 +1,6 @@ appExe = Left(Wscript.ScriptFullName, Len(Wscript.ScriptFullName)-Len(Wscript.ScriptName))&"build\bin\OpenCOR.exe" -If CreateObject("Scripting.FileSystemObject").FileExists(""""&appExe&"""") Then +If CreateObject("Scripting.FileSystemObject").FileExists(appExe) Then args = "" For Each arg in WScript.Arguments