diff options
author | Andrea Gelmini <andrea.gelmini@gelma.net> | 2014-11-15 00:54:01 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2014-11-15 15:38:05 +0000 |
commit | 702d14d954d5dcb88e70cfad8517118f9614c987 (patch) | |
tree | f540a12334eac7c96b832f99617cb8384b790e37 /external/mysqlcppconn | |
parent | c8b07093f104ff4297f6a2bfbc363fd640374f18 (diff) |
Partial revert of da40cac540e7d735edbe9069b3c8ec6af4530208
As requested from Michael Stahl here:
https://gerrit.libreoffice.org/#/c/12164/
Change-Id: Ie00bc789c1dfa3f0049c8915e0deeac7fab6e0fd
Reviewed-on: https://gerrit.libreoffice.org/12432
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'external/mysqlcppconn')
-rw-r--r-- | external/mysqlcppconn/patches/cmake.patch | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/external/mysqlcppconn/patches/cmake.patch b/external/mysqlcppconn/patches/cmake.patch index a856c213076a..79fe064fc8e6 100644 --- a/external/mysqlcppconn/patches/cmake.patch +++ b/external/mysqlcppconn/patches/cmake.patch @@ -127,7 +127,7 @@ diff --recursive -u UnpackedTarball/mysqlcppconn.origin/CMakeLists.txt UnpackedT - ENDIF(STLPORT_INCLUDE_DIR) - - # We want to set the inclusion of the library globally -- ADD_DEFINITIONS(-library=stlport4) # Not a macro definition, but CMake manual says I can!! ;) +- ADD_DEFINITIONS(-library=stlport4) # Not a macro defintion, but CMake manual says I can!! ;) - SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -library=stlport4") - SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -library=stlport4") - SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -library=stlport4") |