Skip to content

Commit

Permalink
Some minor cleaning up.
Browse files Browse the repository at this point in the history
  • Loading branch information
agarny committed Oct 17, 2019
1 parent fc03a45 commit cf171f1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 13 deletions.
15 changes: 5 additions & 10 deletions CMakeLists.txt
Expand Up @@ -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

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions cmake/common.cmake
Expand Up @@ -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})

Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down

0 comments on commit cf171f1

Please sign in to comment.