Skip to content

Scons qt5 linux #55

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Scons qt5 linux #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b3f92d
fix scons finding Qt5 under linux platform
pkestene Nov 27, 2017
926e9c0
fix call to pthread_setname_np which has 2 args under linux pthreads
pkestene Nov 27, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion data/scons/qt5.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ def enable_modules(self, modules, debug=False, crosscompiling=False) :
self.AppendUnique(LIBPATH=[os.path.join("$QTDIR","lib")])
self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt5")])
self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt5",module)])
pcmodules = [module+debugSuffix for module in modules if module not in pclessModules ]
pcmodules = [module.replace('Qt','Qt5')+debugSuffix for module in modules if module not in pclessModules ]
if 'QtDBus' in pcmodules:
self.AppendUnique(CPPPATH=[os.path.join("$QTDIR","include","qt5","QtDBus")])
if "QtAssistant" in pcmodules:
Expand Down
4 changes: 3 additions & 1 deletion src/libcore/thread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -633,7 +633,9 @@ void Thread::initializeOpenMP(size_t threadCount) {
}
const std::string threadName = "Mitsuba: " + thread->getName();

#if defined(__LINUX__) || defined(__OSX__)
#if defined(__LINUX__)
pthread_setname_np(pthread_self(), threadName.c_str());
#elif defined(__OSX__)
pthread_setname_np(threadName.c_str());
#elif defined(__WINDOWS__)
SetThreadName(threadName.c_str());
Expand Down