Commit Graph

57 Commits

Author SHA1 Message Date
Morgan Hardwood
73573e1b87 Cleaned up KLT CMake files from PR #3912 2017-06-26 14:17:23 +02:00
Beep6581
0b4405972d Merge pull request #3912 from mattiaverga/klt
Optionally use system KLT library
2017-06-26 14:08:01 +02:00
heckflosse
2fcb7d9665 Removed bz2 support 2017-06-13 21:05:14 +02:00
Mattia Verga
cbb6bceb63 Fix endif format and indentation 2017-06-07 07:40:48 +02:00
Mattia Verga
75812c900e Move and rename option accordingly to other already present 2017-06-06 10:20:37 +02:00
Mattia Verga
7f4b9e2aa7 Merge Beep6581/dev 2017-06-05 18:16:38 +02:00
Mattia Verga
6b81411561 Use option to let user choose to use system's KLT 2017-06-05 17:59:36 +02:00
ion12
c562385f15 macOS build fixes suggestions take 2
Suggestion for resolving
CMakeLists.txt , macosx_bundle.sh , executable_loader.in
Please review + double-check on macOS
2017-04-18 00:26:28 +01:00
Morgan Hardwood
3886f560b0 Set minimum macOS version to 10.9, fixes #3819 2017-04-12 16:41:24 +02:00
Morgan Hardwood
371410d49b Fixed incorrect elseif in /CMakeLists.txt, #3819 2017-04-12 14:04:32 +02:00
Morgan Hardwood
7f71c611cb CMake - Cleaner absolute path checking, #3678. 2017-04-09 16:10:29 +02:00
Morgan Hardwood
5de2ff4b60 CMake - Man page location for Linux fixed, #3678 2017-04-09 15:44:59 +02:00
Morgan Hardwood
0c0d8bfe43 Small comment and explanation cleanup in /CMakeLists.txt, #3678. 2017-04-09 15:17:30 +02:00
Morgan Hardwood
cd731e1015 Style and formatting cleanup of /CMakeLists.txt, #3678 2017-04-09 15:08:32 +02:00
Morgan Hardwood
36cd8b7787 Mostly macOS-related changes to CMake and build scripts, #3678 2017-04-09 15:04:57 +02:00
heckflosse
9b5f429602 Fixed another bunch of warnings 2017-04-03 21:01:28 +02:00
heckflosse
602162a343 Enable -Wall 2017-04-03 17:17:05 +02:00
Hombre
c654785ae3 Merge branch 'dev' into rt-cli 2017-03-18 18:17:45 +01:00
Flössie
9c9ac0d589 Change -std=gnu++11 to -std=c++11
I propose changing the default `-std=` compiler flag from the non-
standard `gnu++11` to `c++11`. Our code is fully C++11 compliant and
that should be reflected in the C++ standard we choose as default.

Furthermore there's an ambiguity as we make people use
`-DCMAKE_CXX_FLAGS="-std=c++11"` when this is already handled
(differently) in `CMakeLists.txt`. See the [pixls.us](https://discuss.pixls.us/t/rawtherapee-5-and-dcmake-cxx-flags/3145/3)
discussion. You also see it in `AboutThisBuild.txt`:

```
Build flags: -std=c++11 -Wno-deprecated-declarations -Wno-unused-result -std=gnu++11 -march=native -Werror=unused-label -fopenmp -Werror=unknown-pragmas -O3 -DNDEBUG
```

This commit changes `-std=gnu++11` to `-std=c++11` and builds fine
without `-DCMAKE_CXX_FLAGS="-std=c++11"`.
2017-02-14 20:57:57 +01:00
Hombre
fe83cc8134 Merge branch 'dev' into rt-cli 2017-02-14 00:15:23 +01:00
Hombre
a04b3eefba Adding rawtherapee-cli.exe, '-q' (quick start mode) added
Standard rawtherapee.exe now has almost no command line options left.
Use '-h' to see options for each executables.
2017-02-13 23:38:05 +01:00
Morgan Hardwood
6558734830 CMake indentation cleanup. 2017-02-06 22:14:40 +01:00
Morgan Hardwood
16f4731e0b Merge branch 'master' into gtk3 2017-01-30 23:45:46 +01:00
Hombre
52dca96723 Bigfix of InnoSetup parameters (#3628) 2017-01-28 22:39:50 +01:00
Morgan Hardwood
cded30dcbb Fix previous commit: Update old name. 2017-01-28 02:32:31 +01:00
Morgan Hardwood
77d5f8779b Cleaned up CMake logic thanks to Hombre, #3628 2017-01-28 02:29:22 +01:00
Morgan Hardwood
e5c00f0a9d Complete revision to how RawTherapee's version is handled in CMake and in other files, #3628 2017-01-27 15:33:05 +01:00
Dan Horák
094678885c use system KLT library if available 2017-01-02 14:50:23 +01:00
Morgan Hardwood
5344b3749d Merge branch 'master' into gtk3 2016-09-27 23:41:41 +02:00
Jean-Christophe
ef50841629 Merge pull request #3415 from Beep6581/eclipse_c++11
Add full support of c++11 to the Eclipse IDE
2016-09-11 00:47:07 +02:00
Hombre
b04596ec60 Fixing a small glitch in the main cmakefile 2016-09-04 02:55:57 +02:00
Hombre
40794f8e15 Add full support of c++11 to the Eclipse IDE
...(i.e. including when building the index), with the help of
-DCMAKE_ECLIPSE_VERSION="4.6.0" (set to your version, of course) on the
command line. Without this, the declared symbols are wrong and c++11 is
not supported by the IDE (vs the build makefiles).
2016-09-03 21:44:02 +02:00
Adam Reichold
a04c7706db Merge branch 'master' into 'gtk3' 2016-03-05 13:11:00 +01:00
Ingo Weyrich
4df5e64056 Merge pull request #3188 from Beep6581/cbdlbw
Adapt Cbdl to B&W tools
2016-03-01 20:31:14 +01:00
Beep6581
cb916f7c2d Merge branch 'master' into gtk3 2016-02-23 09:26:00 +01:00
Adam Reichold
ca1c1a03d7 Add build option to enable gprof-based profiling instrumentation. 2016-02-22 19:03:10 +01:00
Adam Reichold
1f77da5238 Add a build-time option to easily enable run-time sanitizers available in recent versions of Clang and GCC. 2016-02-21 20:30:02 +01:00
heckflosse
5d9b07ae1a CMakeLists.txt, remove package fftw3 (we use fftw3f) 2016-02-19 17:34:57 +01:00
Beep6581
f5d5083be6 Merged master into gtk3, manually copied rtgui/threadutils.h over from master 2016-01-31 00:00:28 +01:00
Adam Reichold
17d9309f1c Remove PROTECT_VECTORS option since either program is correct without locking or it is not, especially since std::vector is definitely not thread-safe on all major platforms. 2016-01-30 20:39:54 +01:00
Hombre
a54dd81b1a Merge branch 'master' into gtk3 2016-01-11 00:54:25 +01:00
Adam Reichold
5f8a472476 Make the compiler require an error instead of a warning during build configuration to close #3070. 2016-01-08 17:58:54 +01:00
Adam Reichold
8151e0f5ce Merge branch 'master' into 'gtk3'
Most conflicts seemed to be simple enough. There were a lot of `append_text` to
`append` conversions for `Gtk::ComboBoxText`. The `PopUpCommon` class also saw
a lot of changes with non-trivial conflict resolutions.
2016-01-06 23:56:12 +01:00
Adam Reichold
052533bdcc Always enable C++11 support and warn if GCC older than 4.9 is used. 2015-12-19 15:45:35 +01:00
Adam Reichold
c09a00bf16 Expose force the old C++ ABI as a build time flag. 2015-12-19 09:39:54 +01:00
Beep6581
55517812ff Gtk3 branch compiles with sigc++-2.3.1, updated CMakeLists.txt 2015-12-02 10:07:42 +01:00
Beep6581
2e720bdeb8 Merge branch 'master' into gtk3 2015-12-01 18:59:59 +01:00
Adam Reichold
39ef59ddeb Build with '-std=c++11' if libsigc++ version 2.5.1 is used as it does require it. 2015-11-29 11:48:30 +01:00
Hombre
d2fcabea64 The 2 columns of the History list are now of the same width, can't be
resized, and display a tooltip.

The ICM tool has been reworked to avoid loosing space.

The curve's histogram are now displayed.

For Windows users, if you can't build the Gtk3 branch anymore with your
Gcc5.x compiler, try to uncomment line 20-21 of the main CMakeLists.txt.
For some reason, I had to comment that out.
2015-09-17 01:09:02 +02:00
Morgan Hardwood
75f1312d21 Merge branch 'master' into gtk3 2015-08-21 00:40:08 +02:00