Skip to content

Commit

Permalink
Rename macro for travis (#671)
Browse files Browse the repository at this point in the history
  • Loading branch information
xarkes authored Sep 5, 2018
1 parent 590f9fb commit c6260b5
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions src/Cutter.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,17 +55,17 @@ CutterCore::CutterCore(QObject *parent) :

#if defined(APPIMAGE) || defined(MACOS_R2_BUNDLED)
auto prefix = QDir(QCoreApplication::applicationDirPath());
# ifdef APPIMAGE
#ifdef APPIMAGE
// Executable is in appdir/bin
prefix.cdUp();
qInfo() << "Setting r2 prefix =" << prefix.absolutePath() << " for AppImage.";
# else // MACOS_R2_BUNDLED
#else // MACOS_R2_BUNDLED
// Executable is in Contents/MacOS, prefix is Contents/Resources/r2
prefix.cdUp();
prefix.cd("Resources");
prefix.cd("r2");
qInfo() << "Setting r2 prefix =" << prefix.absolutePath() << " for macOS Application Bundle.";
# endif
#endif
setConfig("dir.prefix", prefix.absolutePath());
#endif

Expand Down
6 changes: 3 additions & 3 deletions src/utils/JupyterConnection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,16 +52,16 @@ void JupyterConnection::initPython()
#if defined(APPIMAGE) || defined(MACOS_PYTHON_FRAMEWORK_BUNDLED)
if (customPythonHome.isNull()) {
auto pythonHomeDir = QDir(QCoreApplication::applicationDirPath());
# ifdef APPIMAGE
#ifdef APPIMAGE
// Executable is in appdir/bin
pythonHomeDir.cdUp();
qInfo() << "Setting PYTHONHOME =" << pythonHomeDir.absolutePath() << " for AppImage.";
# else // MACOS_PYTHON_FRAMEWORK_BUNDLED
#else // MACOS_PYTHON_FRAMEWORK_BUNDLED
// @executable_path/../Frameworks/Python.framework/Versions/Current
pythonHomeDir.cd("../Frameworks/Python.framework/Versions/Current");
qInfo() << "Setting PYTHONHOME =" << pythonHomeDir.absolutePath() <<
" for macOS Application Bundle.";
# endif
#endif
customPythonHome = pythonHomeDir.absolutePath();
}
#endif
Expand Down

0 comments on commit c6260b5

Please sign in to comment.