Skip to content

Commit 309679a

Browse files
committed
fix build - use boost static
1 parent f32ca5f commit 309679a

File tree

5 files changed

+24
-4
lines changed

5 files changed

+24
-4
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ CMAKE_MINIMUM_REQUIRED (VERSION 3.7.2)
33
# Set a default build type if none was specified https://blog.kitware.com/cmake-and-the-default-build-type/
44
set(default_build_type "Release")
55
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
6-
6+
77
if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
88
message(STATUS "Setting build type to '${default_build_type}' as none was specified.")
99
set(CMAKE_BUILD_TYPE "${default_build_type}" CACHE

IfcPlusPlus/CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,12 @@ SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYP
2020
SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE})
2121
ENDIF(NOT WIN32)
2222

23+
set(Boost_USE_STATIC_LIBS ON)
2324
FIND_PACKAGE(Boost REQUIRED COMPONENTS date_time)
2425

2526
FILE (GLOB ifc4_source "src/ifcpp/IFC4/lib/*.cpp")
2627

27-
SET(IFCPP_SOURCE_FILES
28+
SET(IFCPP_SOURCE_FILES
2829
src/ifcpp/IFC4/EntityFactory.cpp
2930
src/ifcpp/IFC4/TypeFactory.cpp
3031
src/ifcpp/model/BuildingModel.cpp
@@ -41,7 +42,7 @@ SET(IFCPP_SOURCE_FILES
4142

4243
if (MSVC)
4344
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj ")
44-
45+
4546
ENDIF()
4647

4748
IF(BUILD_STATIC_LIBRARY)

Makefile

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
all: build build_debug
2+
3+
build:
4+
mkdir build
5+
cd build && cmake .. -DBUILD_VIEWER_APPLICATION=OFF -G Ninja
6+
cd build && ninja -j4
7+
8+
build_debug: build
9+
mkdir build_debug
10+
cd build_debug && cmake .. -DBUILD_VIEWER_APPLICATION=OFF \
11+
-G Ninja \
12+
-DCMAKE_BUILD_TYPE=Debug
13+
cd build_debug && ninja -j4
14+
cp build_debug/Debug/* build/Debug
15+
16+
clean:
17+
rm -rf build build_debug

build-command.sh renamed to cmake-configure.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ cmake .. \
77
-DOSGUTIL_LIBRARY_DEBUG=/usr/local/opt/openscenegraph/lib/libosgUtil.dylib \
88
-DOSGVIEWER_LIBRARY_DEBUG=/usr/local/opt/openscenegraph/lib/libosgViewer.dylib \
99
-DOSG_LIBRARY_DEBUG=/usr/local/opt/openscenegraph/lib/libosg.dylib \
10-
-G Ninja
10+
-DBUILD_VIEWER_APPLICATION=OFF \
11+
-G Ninja "$1"

examples/SimpleViewerExampleQt/src/viewer/GraphicsWindowQt.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OU
1818
#include <osg/Version>
1919
#include <osgViewer/ViewerBase>
2020
#include <QInputEvent>
21+
typedef void (APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,const GLvoid *userParam);
2122
#include <QOpenGLContext>
2223

2324
#if (QT_VERSION >= QT_VERSION_CHECK(4, 6, 0))

0 commit comments

Comments
 (0)