Skip to content

Commit c32b413

Browse files
clanmillspiponazo
authored andcommitted
Fix: #575
1 parent 56ba273 commit c32b413

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

README.md

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -622,6 +622,8 @@ $ cd <exiv2dir>/build
622622
$ bin/unit_tests
623623
```
624624
625+
There is a discussion on the web about installing GTest: [https://github.com/Exiv2/exiv2/issues/575](https://github.com/Exiv2/exiv2/issues/575)
626+
625627
[TOC](#TOC)
626628
<name id="5">
627629
## 5 Platform Notes
@@ -631,11 +633,11 @@ There are many ways to set up and configure your platform. The following notes
631633
<name id="5-1">
632634
### 5.1 Linux
633635
634-
Update your system and install the build tools.
636+
Update your system and install the build tools and dependencies (zlib, expat, gtest and others)
635637
636638
```bash
637-
sudo apt --yes update
638-
sudo apt install --yes build-essential git libxml2-utils cmake python3 libexpat1-dev libz-dev
639+
$ sudo apt --yes update
640+
$ sudo apt install --yes build-essential git clang ccache python3 libxml2-utils cmake python3 libexpat1-dev libz-dev zlib1g-dev libssh-dev libcurl4-openssl-dev libgtest-dev google-mock
639641
```
640642
641643
Get the code from GitHub and build
@@ -668,6 +670,8 @@ We provide support for both 64bit and 32bit builds using MinGW/msys2. [https://w
668670
669671
Support for MinGW/msys1.0 32 bit build was provided for Exiv2 v0.26. MinGW/msys1.0 is not supported by Team Exiv2 for Exiv2 v0.27 and later.
670672
673+
There is a discussion on the web about installing GTest: [https://github.com/Exiv2/exiv2/issues/575](https://github.com/Exiv2/exiv2/issues/575)
674+
671675
#### MinGW/msys2 64 bit
672676
Install: [http://repo.msys2.org/distrib/x86\_64/msys2-x86\_64-20180531.exe](http://repo.msys2.org/distrib/x86_64/msys2-x86_64-20180531.exe)
673677
@@ -748,6 +752,8 @@ make, cmake, gcc, gettext-devel pkg-config, dos2unix, zlib-devel, libexpat1-deve
748752
749753
Download and build libiconv-1.15: [https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz](https://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.15.tar.gz)
750754
755+
There is a discussion on the web about installing GTest: [https://github.com/Exiv2/exiv2/issues/575](https://github.com/Exiv2/exiv2/issues/575)
756+
751757
Download and build cmake from source because I can't get the cygwin installed cmake 3.6.2 to work.
752758
To build cmake from source, you need libncurses. [https://cmake.org/download/](https://cmake.org/download/)
753759
@@ -789,4 +795,4 @@ cmd
789795
790796
[TOC](#TOC)
791797
792-
Written by Robin Mills<br>[email protected]<br>Updated: 2018-11-28
798+
Written by Robin Mills<br>[email protected]<br>Updated: 2018-12-01

cmake/compilerFlags.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ if ( MINGW OR UNIX OR MSYS ) # MINGW, Linux, APPLE, CYGWIN
4545
set(SANITIZER_FLAGS "-fno-omit-frame-pointer -fsanitize=address")
4646
endif()
4747
elseif( COMPILER_IS_CLANG )
48-
if ( CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.3 )
48+
if ( CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 4.9 )
4949
set(SANITIZER_FLAGS "-fno-omit-frame-pointer -fsanitize=address,undefined -fno-sanitize-recover=all")
50+
elseif ( CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.4 )
51+
set(SANITIZER_FLAGS "-fno-omit-frame-pointer -fsanitize=address,undefined")
5052
elseif( CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 3.1 )
5153
set(SANITIZER_FLAGS "-fno-omit-frame-pointer -fsanitize=address")
5254
endif()

0 commit comments

Comments
 (0)