summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorDon Bright <hugh.m.bright@gmail.com>2011-12-17 18:56:50 (GMT)
committerDon Bright <hugh.m.bright@gmail.com>2011-12-17 18:56:50 (GMT)
commitee2cdb6489121ab5f77522053fd4142fb06a6f2b (patch)
treee388bfab01a0ffbd039132f319ba517799fd1f1f /tests
parentcae91b57cf839ee7b8902ca8b47efd1dd6875121 (diff)
parentef29553226ddb3f8f0565dbd6004d76e26c80ddc (diff)
Merge remote branch 'upstream/master'
Conflicts: openscad.pro
Diffstat (limited to 'tests')
-rw-r--r--tests/CMakeLists.txt2
-rw-r--r--tests/OffscreenContext.mm2
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index edd89aa..986076e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -12,7 +12,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}")
# Build debug build as default
if(NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE Debug)
+ set(CMAKE_BUILD_TYPE RelWithDebInfo)
endif()
if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
diff --git a/tests/OffscreenContext.mm b/tests/OffscreenContext.mm
index ea46275..990d3a4 100644
--- a/tests/OffscreenContext.mm
+++ b/tests/OffscreenContext.mm
@@ -32,7 +32,7 @@ std::string offscreen_context_getinfo(OffscreenContext *ctx)
Gestalt(gestaltSystemVersionMinor, &minorVersion);
Gestalt(gestaltSystemVersionBugFix, &bugFixVersion);
- char *arch = "unknown";
+ const char *arch = "unknown";
if (sizeof(int*) == 4) arch = "32-bit";
else if (sizeof(int*) == 8) arch = "64-bit";
contact: Jan Huwald // Impressum