Commit Graph
18 Commits
Author SHA1 Message Date
Roland Kaufmann 6d38344261 Don't validate shader programs on MacOS X
If the paint event is called before the view is visible, validation
of the shader program will cause an error on MacOS X 10.8 and forward,
stating that the operation was ignored.
2015-01-01 19:46:25 +01:00
Roland Kaufmann 4378f4886a Add application icon into the executable bundle 2015-01-01 19:46:25 +01:00
Roland Kaufmann 9fb9f84a7a Build resulting executable as a bundle on MacOS X
This will allow us to launch it from the Finder and add it to the dock
2015-01-01 19:46:25 +01:00
Roland Kaufmann eac27f149a Enable in-package substitute of tr1/tuple
In clang 6.0 the tr1/tuple header is not present, and this cause a
compilation error inside of the gtest framework. However, if we set a
define, it will use its own substitute of tr1/tuple, which is sufficient
for the unit tests.
2015-01-01 19:46:25 +01:00
Roland Kaufmann b019ad260d Duplicate MacOS X framework voodoo for mkoctfile
When CMake encounter a framework in the list passed to
include_directories, it will change this into an -F option. We have to
do the same when we want to pass this list to the mkoctfile custom
command.
2015-01-01 19:46:25 +01:00
Roland Kaufmann e0da9a611f Remove copy ctor of atomic counter on OS X
This is not present on any of the other platforms so it is not needed,
but it uses a removed method (to receive the value) so it won't compile.
2015-01-01 19:46:24 +01:00
Roland Kaufmann b25290bebd Complete instantiated types
RivReservoirPartMgr uses a Collection of RivGridPartMgr. The Collection
indirectly causes the release() method of the Object base class of
RivGridPartMgr to be called as part of its destructor, but this is not
allowed for incomplete types and RivGridPartMgr is only forward-declared
at the time of the instantiation (in RivReservoirPartMgr).

A similar problem occurs in the use of RigStatisticsDataCache in the
type RigCaseCellResultsData.
2015-01-01 19:46:24 +01:00
Roland Kaufmann 90249e1158 Use pthreads on MacOS X too
MacOS X is POSIXy enough for this to be a suitable choice
2015-01-01 19:46:24 +01:00
Roland Kaufmann 20f00f4a3a Put launcher for ResInsight in desktop environment 2013-03-27 00:43:13 +01:00
Roland Kaufmann f6dd430b87 Path to Octave plugins is taken from conf. program 2013-03-27 00:43:13 +01:00
Roland Kaufmann e7613fe9ee Optionally enable system installation of binaries
If the option PRIVATE_INSTALL is set to OFF, LSB-compliant paths are
used for the `install' target.
2013-03-27 00:43:01 +01:00
Roland Kaufmann 3fcd05e838 Refactor variable containing filenames for license
These will be used in several scenarios later.
2013-03-27 00:39:06 +01:00
Roland Kaufmann e63c609111 Use $ORIGIN to load libs from program directory
The RPATH attribute won't expand relative directories (such as ".")
neither can it be a semi-colon separated list; the old way of setting
it was wrong and would lead to libraries being loaded from system
directories instead.
2013-03-27 00:38:59 +01:00
Roland Kaufmann 111e2860f7 Ignore files generated by CMake for Qt resources 2012-07-20 13:26:22 +02:00
Roland Kaufmann 127abb9532 Remove object files which is generated from source 2012-07-06 14:57:16 +02:00
Roland Kaufmann 692082df96 Ignore build artifacts
Ignore any files that stems from building in the development tree itself,
which can be useful e.g. for letting the debugger easily pick up the
source files.
2012-07-06 14:57:16 +02:00
Roland Kaufmann 0d17997eb3 Probe only for OpenGL levels available in this Qt version
Each version of Qt supports a set of OpenGL levels; the level displayed
to the user is only as high as what was supported at compile-time. Hence
it should be harmless to degrade gracefully to previous Qt versions.
2012-07-06 12:33:54 +02:00
Roland Kaufmann ec7057eb78 Use copy ctor instead of conversion through QChar*
Versions of Qt < 4.7 do not have a QString constructor from QChar*
without specifying the size of the string. However, since the QString
is copy-on-write, the QString object can be passed to the copy
constructor of the return value directly!
2012-07-06 12:29:36 +02:00