Some minor cleaning up.

CMakeLists.txt

@@ -286,27 +286,21 @@ if(WIN32)
         set(EXTERNAL_PACKAGE_DIR debug)
     endif()
 
-    set(DEST_EXTERNAL_BINARIES_DIR bin)
+    set(DEST_EXTERNAL_LIBRARIES_DIR bin)
 else()
     set(EXTERNAL_PACKAGE_DIR .)
 
     if(APPLE)
-        set(DEST_EXTERNAL_BINARIES_DIR ${CMAKE_PROJECT_NAME}.app/Contents/Frameworks)
+        set(DEST_EXTERNAL_LIBRARIES_DIR ${CMAKE_PROJECT_NAME}.app/Contents/Frameworks)
     else()
-        set(DEST_EXTERNAL_BINARIES_DIR lib)
+        set(DEST_EXTERNAL_LIBRARIES_DIR lib)
     endif()
 endif()
 
-set(FULL_DEST_EXTERNAL_BINARIES_DIR ${PROJECT_BUILD_DIR}/${DEST_EXTERNAL_BINARIES_DIR})
+set(FULL_DEST_EXTERNAL_LIBRARIES_DIR ${PROJECT_BUILD_DIR}/${DEST_EXTERNAL_LIBRARIES_DIR})
 
-if(NOT EXISTS ${FULL_DEST_EXTERNAL_BINARIES_DIR})
-    file(MAKE_DIRECTORY ${FULL_DEST_EXTERNAL_BINARIES_DIR})
-endif()
-
-if(APPLE)
-    set(FULL_DEST_EXTERNAL_BASE_DIR ${FULL_DEST_EXTERNAL_BINARIES_DIR})
-else()
-    set(FULL_DEST_EXTERNAL_BASE_DIR ${PROJECT_BUILD_DIR})
+if(NOT EXISTS ${FULL_DEST_EXTERNAL_LIBRARIES_DIR})
+    file(MAKE_DIRECTORY ${FULL_DEST_EXTERNAL_LIBRARIES_DIR})
 endif()
 
 # Some in-house CMake macros

clean

@@ -1,5 +1,3 @@
 #!/bin/sh
 
-appDir="$(cd "$(dirname "$0")"; pwd)"
-
-${appDir}/scripts/genericclean
+"$(cd "$(dirname "$0")"; pwd)/scripts/genericclean"

clean.bat

@@ -1,5 +1,3 @@
 @ECHO OFF
 
-SET AppDir=%~dp0
-
-CALL "%AppDir%scripts\genericclean"
+CALL "%~dp0scripts\genericclean"

cleanall

@@ -1,5 +1,3 @@
 #!/bin/sh
 
-appDir="$(cd "$(dirname "$0")"; pwd)"
-
-${appDir}/scripts/genericclean all
+"$(cd "$(dirname "$0")"; pwd)/scripts/genericclean" all

cleanall.bat

@@ -1,5 +1,3 @@
 @ECHO OFF
 
-SET AppDir=%~dp0
-
-CALL "%AppDir%scripts\genericclean" all
+CALL "%~dp0scripts\genericclean" all

cmake/common.cmake

@@ -319,12 +319,12 @@ macro(add_plugin PLUGIN_NAME)
                 copy_file_to_build_dir(${COPY_TARGET} ${ARG_EXTERNAL_BINARIES_DIR} . ${ARG_EXTERNAL_BINARY})
             endif()
 
-            copy_file_to_build_dir(${COPY_TARGET} ${ARG_EXTERNAL_BINARIES_DIR} ${DEST_EXTERNAL_BINARIES_DIR} ${ARG_EXTERNAL_BINARY})
+            copy_file_to_build_dir(${COPY_TARGET} ${ARG_EXTERNAL_BINARIES_DIR} ${DEST_EXTERNAL_LIBRARIES_DIR} ${ARG_EXTERNAL_BINARY})
 
             # Strip the external library of all its local symbols, if possible
 
             if(NOT WIN32)
-                strip_file(${COPY_TARGET} ${FULL_DEST_EXTERNAL_BINARIES_DIR}/${ARG_EXTERNAL_BINARY})
+                strip_file(${COPY_TARGET} ${FULL_DEST_EXTERNAL_LIBRARIES_DIR}/${ARG_EXTERNAL_BINARY})
             endif()
 
             # Link the plugin to the external library
@@ -338,7 +338,7 @@ macro(add_plugin PLUGIN_NAME)
                 )
             elseif(APPLE)
                 target_link_libraries(${PROJECT_NAME}
-                    ${FULL_DEST_EXTERNAL_BINARIES_DIR}/${ARG_EXTERNAL_BINARY}
+                    ${FULL_DEST_EXTERNAL_LIBRARIES_DIR}/${ARG_EXTERNAL_BINARY}
                 )
             else()
                 target_link_libraries(${PROJECT_NAME}
@@ -351,13 +351,13 @@ macro(add_plugin PLUGIN_NAME)
 
             if(APPLE)
                 if("${COPY_TARGET}" STREQUAL "DIRECT")
-                    execute_process(COMMAND install_name_tool -id @rpath/${ARG_EXTERNAL_BINARY} ${FULL_DEST_EXTERNAL_BINARIES_DIR}/${ARG_EXTERNAL_BINARY})
+                    execute_process(COMMAND install_name_tool -id @rpath/${ARG_EXTERNAL_BINARY} ${FULL_DEST_EXTERNAL_LIBRARIES_DIR}/${ARG_EXTERNAL_BINARY})
                 else()
                     add_custom_command(TARGET ${COPY_TARGET} POST_BUILD
-                                       COMMAND install_name_tool -id @rpath/${ARG_EXTERNAL_BINARY} ${FULL_DEST_EXTERNAL_BINARIES_DIR}/${ARG_EXTERNAL_BINARY})
+                                       COMMAND install_name_tool -id @rpath/${ARG_EXTERNAL_BINARY} ${FULL_DEST_EXTERNAL_LIBRARIES_DIR}/${ARG_EXTERNAL_BINARY})
                 endif()
 
-                strip_file(${COPY_TARGET} ${FULL_DEST_EXTERNAL_BINARIES_DIR}/${ARG_EXTERNAL_BINARY})
+                strip_file(${COPY_TARGET} ${FULL_DEST_EXTERNAL_LIBRARIES_DIR}/${ARG_EXTERNAL_BINARY})
             endif()
 
             # Package the external library, if needed
@@ -517,7 +517,7 @@ macro(add_plugin PLUGIN_NAME)
                             )
                         elseif(APPLE)
                             target_link_libraries(${TEST_NAME}
-                                ${FULL_DEST_EXTERNAL_BINARIES_DIR}/${ARG_EXTERNAL_BINARY}
+                                ${FULL_DEST_EXTERNAL_LIBRARIES_DIR}/${ARG_EXTERNAL_BINARY}
                             )
                         else()
                             target_link_libraries(${TEST_NAME}

distrib/linux/application.in

@@ -1,5 +1,3 @@
 #!/bin/sh
 
-appDir="$(cd "$(dirname "$0")"; pwd)"
-
-${appDir}/bin/@CMAKE_PROJECT_NAME@ $*
+"$(cd "$(dirname "$0")"; pwd)/bin/@CMAKE_PROJECT_NAME@" $*

distrib/macos/application.in

@@ -1,5 +1,3 @@
 #!/bin/sh
 
-appDir="$(cd "$(dirname "$0")"; pwd)"
-
-${appDir}/@CMAKE_PROJECT_NAME@.app/Contents/MacOS/@CMAKE_PROJECT_NAME@ $*
+"$(cd "$(dirname "$0")"; pwd)/@CMAKE_PROJECT_NAME@.app/Contents/MacOS/@CMAKE_PROJECT_NAME@" $*

distrib/windows/application.bat.in

@@ -2,6 +2,4 @@
 
 TITLE Running the ${CMAKE_PROJECT_NAME} environment...
 
-SET AppBase=%~dp0bin\${CMAKE_PROJECT_NAME}
-
-"%AppBase%" %*
+"%~dp0bin\${CMAKE_PROJECT_NAME}" %*

make

@@ -1,5 +1,3 @@
 #!/bin/sh
 
-appDir="$(cd "$(dirname "$0")"; pwd)"
-
-${appDir}/scripts/genericmake Release $*
+"$(cd "$(dirname "$0")"; pwd)/scripts/genericmake" Release $*

make.bat

@@ -1,5 +1,3 @@
 @ECHO OFF
 
-SET AppDir=%~dp0
-
-CALL "%AppDir%scripts\genericmake" Release %*
+CALL "%~dp0scripts\genericmake" Release %*

maketests

@@ -1,5 +1,3 @@
 #!/bin/sh
 
-appDir="$(cd "$(dirname "$0")"; pwd)"
-
-${appDir}/scripts/genericmake Tests $*
+"$(cd "$(dirname "$0")"; pwd)/scripts/genericmake" Tests $*

maketests.bat

@@ -1,5 +1,3 @@
 @ECHO OFF
 
-SET AppDir=%~dp0
-
-CALL "%AppDir%scripts\genericmake" Tests %*
+CALL "%~dp0scripts\genericmake" Tests %*

run.vbs

@@ -1,13 +1,13 @@
-appExe = Left(Wscript.ScriptFullName, Len(Wscript.ScriptFullName)-Len(Wscript.ScriptName))&"build\bin\OpenCOR.exe"
+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
         args = args&" "&arg
     Next
 
-    cmd = """"&appExe&args&""""
+    cmd = """"&AppExe&args&""""
 
     CreateObject("WScript.Shell").Run cmd, 1, False
 Else

runtests.bat

@@ -2,10 +2,10 @@
 
 TITLE Running OpenCOR's tests...
 
-SET appTestsExe=%~dp0build\bin\runtests.exe
+SET AppTestsExe=%~dp0build\bin\runtests.exe
 
-IF NOT EXIST %appTestsExe% (
+IF NOT EXIST %AppTestsExe% (
     ECHO OpenCOR's tests must first be built before being run.
 ) ELSE (
-    "%appTestsExe%"
+    "%AppTestsExe%"
 )

src/misc/cliutils.cpp

@@ -139,7 +139,7 @@ void initPluginsPath(int pArgC, char *pArgV[]) // NOLINT(hicpp-avoid-c-arrays, m
 
         pluginsDir = appDir+"/plugins";
     }
-#elif defined(Q_OS_MAC)
+#else
     pluginsDir = appDir+"/../PlugIns";
 #endif
 

src/plugins/simulation/SimulationExperimentView/src/simulationexperimentviewinformationparameterswidget.cpp

@@ -449,7 +449,7 @@ void SimulationExperimentViewInformationParametersWidget::populateContextMenu(Ce
 
     mContextMenu->addMenu(mPlotAgainstMenu);
 
-    // Initialise our two main menu items
+    // Initialise our menu items
 
     retranslateContextMenu();
 

src/plugins/support/SimulationSupport/src/simulation.cpp

@@ -1732,8 +1732,8 @@ void Simulation::run()
         return;
     }
 
-    // Initialise our worker, if we don't already have one and if the
-    // simulation settings we were given are sound
+    // Initialise our worker, if we don't already have one and if the simulation
+    // settings we were given are sound
 
     if ((mWorker == nullptr) && simulationSettingsOk()) {
         // Create and move our worker to a thread