fbsd.diff

Jürgen Fischer, 2013-05-26 11:24 AM

Download (3.39 KB)

View differences:

src/app/CMakeLists.txt
483 483
    MACOSX_BUNDLE_INFO_PLIST "${CMAKE_SOURCE_DIR}/mac/app.info.plist.in")
484 484
ENDIF(APPLE)
485 485

  
486
IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
487
  FIND_LIBRARY(EXECINFO_LIBRARY NAMES execinfo)
488
 TARGET_LINK_LIBRARIES(${QGIS_APP_NAME} ${EXECINFO_LIBRARY})
489
ENDIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
490

  
486 491
IF (POSTGRES_FOUND)
487 492
  TARGET_LINK_LIBRARIES (${QGIS_APP_NAME} ${POSTGRES_LIBRARY})
488 493
ENDIF (POSTGRES_FOUND)
src/app/main.cpp
79 79
#include "qgsrectangle.h"
80 80
#include "qgslogger.h"
81 81

  
82
#if defined(linux) && !defined(ANDROID)
82
#if (defined(linux) && !defined(ANDROID)) || defined(__FreeBSD__)
83 83
#include <unistd.h>
84 84
#include <execinfo.h>
85 85
#include <signal.h>
......
195 195
}
196 196
#endif
197 197

  
198
#if defined(linux) && !defined(ANDROID)
198
#if (defined(linux) && !defined(ANDROID)) || defined(__FreeBSD__)
199 199
void qgisCrash( int signal )
200 200
{
201 201
  qFatal( "QGIS died on signal %d", signal );
......
232 232
           || 0 == strncmp( msg, "QPainter::", 10 ) )
233 233
      {
234 234
#if 0
235
#if defined(linux) && !defined(ANDROID)
235
#if (defined(linux) && !defined(ANDROID)) || defined(__FreeBSD__)
236 236
        fprintf( stderr, "Stacktrace (run through c++filt):\n" );
237 237
        void *buffer[256];
238 238
        int nptrs = backtrace( buffer, sizeof( buffer ) / sizeof( *buffer ) );
......
254 254
    case QtFatalMsg:
255 255
    {
256 256
      fprintf( stderr, "Fatal: %s\n", msg );
257
#if defined(linux) && !defined(ANDROID)
257
#if (defined(linux) && !defined(ANDROID)) || defined(__FreeBSD__)
258 258
      ( void ) write( STDERR_FILENO, "Stacktrace (run through c++filt):\n", 34 );
259 259
      void *buffer[256];
260 260
      int nptrs = backtrace( buffer, sizeof( buffer ) / sizeof( *buffer ) );
......
276 276
#endif  // _MSC_VER
277 277
#endif  // WIN32
278 278

  
279
#if defined(linux) && !defined(ANDROID)
279
#if (defined(linux) && !defined(ANDROID)) || defined(__FreeBSD__)
280 280
  // Set up the custom qWarning/qDebug custom handler
281 281
  qInstallMsgHandler( myMessageOutput );
282 282

  
src/plugins/grass/CMakeLists.txt
155 155
  ${OPENPTY_LIBRARY}
156 156
)
157 157

  
158
IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
159
  TARGET_LINK_LIBRARIES(grassplugin ulog)
160
ENDIF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
161

  
158 162
# override default path where built files are put to allow running qgis without installing
159 163
# the binary goes under libexec subdir
160 164
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_LIBEXEC_SUBDIR}/grass/bin)
src/plugins/grass/qtermwidget/kpty.cpp
50 50
#define HAVE_LIBUTIL_H
51 51
#endif
52 52

  
53
#if defined(__FreeBSD__)
54
#define HAVE_UTEMPTER
55
#endif
56

  
53 57
#include <sys/types.h>
54 58
#include <sys/ioctl.h>
55 59
#include <sys/time.h>