From 876912e5a0621a9e27391475025691cfeae64468 Mon Sep 17 00:00:00 2001 From: gmt2001 Date: Sat, 30 Mar 2013 13:43:21 -0700 Subject: [PATCH 1/4] Added missing define to blackmisc.pro --- src/blackmisc/blackmisc.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro index 5fa9106eb..263247b94 100644 --- a/src/blackmisc/blackmisc.pro +++ b/src/blackmisc/blackmisc.pro @@ -15,6 +15,7 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) { } DEFINES += LOG_IN_FILE +DEFINES += Q_OS_LINUX HEADERS += \ logmessage.h \ From d61f8845da5c6131925d48d68643e748ef34eb16 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Sun, 31 Mar 2013 14:46:08 +0200 Subject: [PATCH 2/4] #12 Fixed linker error and Mac build --- samples/interpolator/sample_interpolator.pro | 5 +++-- src/blackmisc/blackmisc.pro | 1 - src/blackmisc/display.cpp | 4 +--- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/samples/interpolator/sample_interpolator.pro b/samples/interpolator/sample_interpolator.pro index 371bdfd05..b669712e9 100644 --- a/samples/interpolator/sample_interpolator.pro +++ b/samples/interpolator/sample_interpolator.pro @@ -25,8 +25,9 @@ win32-msvc* { PRE_TARGETDEPS += ../../lib/libblackmisc.a \ ../../lib/libblackcore.a - LIBS += ../../lib/libblackmisc.a \ - ../../lib/libblackcore.a + LIBS += ../../lib/libblackcore.a \ + ../../lib/libblackmisc.a + } DESTDIR = ../../bin diff --git a/src/blackmisc/blackmisc.pro b/src/blackmisc/blackmisc.pro index 263247b94..5fa9106eb 100644 --- a/src/blackmisc/blackmisc.pro +++ b/src/blackmisc/blackmisc.pro @@ -15,7 +15,6 @@ precompile_header:!isEmpty(PRECOMPILED_HEADER) { } DEFINES += LOG_IN_FILE -DEFINES += Q_OS_LINUX HEADERS += \ logmessage.h \ diff --git a/src/blackmisc/display.cpp b/src/blackmisc/display.cpp index ab1612b52..5dbc285e3 100644 --- a/src/blackmisc/display.cpp +++ b/src/blackmisc/display.cpp @@ -9,9 +9,7 @@ #include "blackmisc/context.h" #include "blackmisc/display.h" -#ifdef Q_OS_LINUX - #include -#endif +#include namespace BlackMisc { From e24d563729261c6f608bcecdb89843c1516b7309 Mon Sep 17 00:00:00 2001 From: gmt2001 Date: Sun, 31 Mar 2013 11:23:16 -0400 Subject: [PATCH 3/4] Fixed CXX flags to use C++11 standard WITH_STATIC is always defaulted to ON for the time being --- CMakeLists.txt | 6 +----- src/blackcore/CMakeLists.txt | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d483f9227..6ceae58d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -25,11 +25,7 @@ OPTION(WITH_BLACK_LIB "Build BlackBox libraries" IF(WITH_BLACK_LIB) OPTION(WITH_BLACK_CORE "Build Core library" ON ) OPTION(WITH_BLACK_MISC "Build Misc library" ON ) - IF(WIN32) - OPTION(WITH_STATIC "With static libraries." ON ) - ELSE(WIN32) - OPTION(WITH_STATIC "With static libraries." OFF) - ENDIF() + OPTION(WITH_STATIC "With static libraries." ON ) OPTION(WITH_BLACK_SAMPLES "With BlackLib Samples." ON) ENDIF(WITH_BLACK_LIB) diff --git a/src/blackcore/CMakeLists.txt b/src/blackcore/CMakeLists.txt index 13c37653c..2a5762087 100644 --- a/src/blackcore/CMakeLists.txt +++ b/src/blackcore/CMakeLists.txt @@ -2,6 +2,8 @@ FILE(GLOB blackcore_SOURCES *.cpp) FILE(GLOB blackcore_HEADERS *.h) SET(blackcore_HEADERS_QOBJECT fsd_client.h) + +SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") QT4_WRAP_CPP(blackcore_HEADERS_MOC ${blackcore_HEADERS_QOBJECT}) From be743ba75e0f43302f8c5df3b8a3d911cc261335 Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Thu, 4 Apr 2013 20:50:53 +0200 Subject: [PATCH 4/4] #12 fix capitalization errors on linux --- CMakeLists.txt | 4 ++++ samples/CMakeLists.txt | 4 ++-- samples/geodetic2ecef/CMakeLists.txt | 6 +++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6ceae58d4..83375e97c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -165,6 +165,10 @@ IF(MSVC) ENDIF(MSVC11) ADD_COMPILER_FLAGS("/D_CRT_SECURE_NO_DEPRECATE /D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DWIN32 /D_WINDOWS /Zm1000 /wd4250") + + ADD_DEFINITIONS( + /Zc:wchar_t- # Treat wchar_t as built-in type + ) ENDIF() ############### Configure checks ############### diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 4ec2bec48..2e087986a 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -1,6 +1,6 @@ -ADD_SUBDIRECTORY(Logging) +ADD_SUBDIRECTORY(logging) ADD_SUBDIRECTORY(com_server) ADD_SUBDIRECTORY(com_client) -ADD_SUBDIRECTORY(Geodetic2Ecef) +ADD_SUBDIRECTORY(geodetic2ecef) ADD_SUBDIRECTORY(interpolator) ADD_SUBDIRECTORY(config) \ No newline at end of file diff --git a/samples/geodetic2ecef/CMakeLists.txt b/samples/geodetic2ecef/CMakeLists.txt index b3afc69b1..0b3848fa2 100644 --- a/samples/geodetic2ecef/CMakeLists.txt +++ b/samples/geodetic2ecef/CMakeLists.txt @@ -1,6 +1,6 @@ FILE(GLOB SRC *.cpp) -ADD_EXECUTABLE(sample_Geodetic2Ecef ${SRC}) +ADD_EXECUTABLE(sample_geodetic2ecef ${SRC}) -TARGET_LINK_LIBRARIES(sample_Geodetic2Ecef blackmisc blackcore ${QT_LIBRARIES}) -SET_TARGET_PROPERTIES(sample_Geodetic2Ecef PROPERTIES PROJECT_LABEL "Samples - Geodetic to Ecef") \ No newline at end of file +TARGET_LINK_LIBRARIES(sample_geodetic2ecef blackmisc blackcore ${QT_LIBRARIES}) +SET_TARGET_PROPERTIES(sample_geodetic2ecef PROPERTIES PROJECT_LABEL "Samples - Geodetic to Ecef") \ No newline at end of file