Skip to content

Commit 2ad03d6

Browse files
psi29apsi29a
authored
Merge pull request #25 from elsid/github_ci
Setup CI to build libraries and plugins required for OpenMW only on Windows
2 parents 675feae + fec7d6a commit 2ad03d6

File tree

8 files changed

+122
-65
lines changed

8 files changed

+122
-65
lines changed

‎.github/workflows/build.yaml‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
name: Build
2+
3+
on: push
4+
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
7+
cancel-in-progress: true
8+
9+
jobs:
10+
windows:
11+
strategy:
12+
fail-fast: true
13+
14+
matrix:
15+
conf:
16+
- Release
17+
18+
runs-on: windows-latest
19+
20+
steps:
21+
- uses: actions/checkout@v4
22+
23+
- name: Enable vcpkg downloads cache
24+
uses: actions/cache@v4
25+
with:
26+
path: 'C:/vcpkg/downloads'
27+
key: vcpkg_downloads_cache_v1
28+
29+
- name: Enable vcpkg installed cache
30+
uses: actions/cache@v4
31+
with:
32+
path: 'C:/vcpkg/installed'
33+
key: vcpkg_installed_cache_v1
34+
35+
- name: Install dependencies
36+
run: >
37+
vcpkg install --triplet x64-windows
38+
collada-dom
39+
freetype
40+
libiconv
41+
libjpeg-turbo
42+
libpng
43+
libxml2
44+
opengl-registry
45+
tiff
46+
zlib
47+
48+
- uses: ilammy/msvc-dev-cmd@v1
49+
50+
- name: Configure
51+
run: >
52+
cmake
53+
-G Ninja
54+
-B ${{ github.workspace }}/build
55+
-D CMAKE_BUILD_TYPE=${{ matrix.conf }}
56+
-D CMAKE_TOOLCHAIN_FILE='C:/vcpkg/scripts/buildsystems/vcpkg.cmake'
57+
-D CMAKE_INSTALL_PREFIX=${{ github.workspace }}/build/install
58+
-D CMAKE_CXX_STANDARD=11
59+
-D CMAKE_C_FLAGS='/DWIN32 /D_WINDOWS /Zi'
60+
-D CMAKE_CXX_FLAGS='/DWIN32 /D_WINDOWS /GR /EHsc /Zi'
61+
-D OPENGL_PROFILE=GL2
62+
-D OSG_MSVC_VERSIONED_DLL=OFF
63+
-D OSG_DETERMINE_WIN_VERSION=OFF
64+
-D OSG_FIND_3RD_PARTY_DEPS=OFF
65+
-D OSG_USE_UTF8_FILENAME=ON
66+
-D BUILD_OSG_PLUGINS_BY_DEFAULT=OFF
67+
-D BUILD_OSG_PLUGIN_OSG=ON
68+
-D BUILD_OSG_PLUGIN_DDS=ON
69+
-D BUILD_OSG_PLUGIN_TGA=ON
70+
-D BUILD_OSG_PLUGIN_BMP=ON
71+
-D BUILD_OSG_PLUGIN_JPEG=ON
72+
-D BUILD_OSG_PLUGIN_PNG=ON
73+
-D BUILD_OSG_PLUGIN_FREETYPE=ON
74+
-D BUILD_OSG_PLUGIN_DAE=ON
75+
-D BUILD_OSG_PLUGIN_KTX=ON
76+
-D BUILD_OSG_APPLICATIONS=OFF
77+
-D BUILD_OSG_DEPRECATED_SERIALIZERS=OFF
78+
-D DYNAMIC_OPENTHREADS=ON
79+
-D DYNAMIC_OPENSCENEGRAPH=ON
80+
81+
- name: Build
82+
run: cmake --build ${{ github.workspace }}/build --parallel
83+
84+
- name: Install
85+
run: cmake --install ${{ github.workspace }}/build
86+
87+
- name: Store osg build artifacts
88+
uses: actions/upload-artifact@v4
89+
with:
90+
name: osg-${{ github.sha }}
91+
path: ${{ github.workspace }}/build/install
92+
93+
- name: Store osg dependencies build artifacts
94+
uses: actions/upload-artifact@v4
95+
with:
96+
name: osg-dependencies-${{ github.sha }}
97+
path: 'C:/vcpkg/installed'

‎CMakeLists.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -408,6 +408,10 @@ IF(WIN32 AND NOT ANDROID)
408408
SET(CMAKE_SHARED_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
409409
SET(CMAKE_EXE_LINKER_FLAGS_DEBUG "/debug /INCREMENTAL:NO")
410410
ENDIF(NOT OSG_MSVC_DEBUG_INCREMENTAL_LINK)
411+
412+
SET(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG")
413+
SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /DEBUG")
414+
SET(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /DEBUG")
411415
ENDIF(MSVC)
412416
ENDIF(WIN32 AND NOT ANDROID)
413417

‎CMakeModules/FindCOLLADA.cmake‎

Lines changed: 13 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ IF(APPLE)
2929
ELSEIF(MINGW)
3030
SET(COLLADA_BUILDNAME "mingw")
3131
SET(COLLADA_BOOST_BUILDNAME ${COLLADA_BUILDNAME})
32-
ELSEIF((MSVC_VERSION GREATER 1910) OR (MSVC_VERSION EQUAL 1910))
33-
SET(COLLADA_BUILDNAME "vc14")
34-
SET(COLLADA_BOOST_BUILDNAME "vc141")
35-
ELSEIF(MSVC_VERSION EQUAL 1900)
32+
ELSEIF(MSVC_VERSION GREATER_EQUAL 1900)
3633
SET(COLLADA_BUILDNAME "vc14")
3734
SET(COLLADA_BOOST_BUILDNAME "vc140")
3835
ELSEIF(MSVC_VERSION EQUAL 1800)
@@ -61,6 +58,7 @@ ENDIF()
6158

6259

6360
FIND_PATH(COLLADA_INCLUDE_DIR dae.h
61+
PATHS
6462
${COLLADA_DOM_ROOT}/include
6563
$ENV{COLLADA_DIR}/include
6664
$ENV{COLLADA_DIR}
@@ -69,27 +67,19 @@ FIND_PATH(COLLADA_INCLUDE_DIR dae.h
6967
/Library/Frameworks
7068
/opt/local/Library/Frameworks #macports
7169
/usr/local/include
72-
/usr/local/include/colladadom
73-
/usr/local/include/collada-dom
74-
/usr/local/include/collada-dom2.5
75-
/usr/local/include/collada-dom2.4
76-
/usr/local/include/collada-dom2.2
77-
/opt/local/include/collada-dom
78-
/opt/local/include/collada-dom2.5
79-
/opt/local/include/collada-dom2.4
80-
/opt/local/include/collada-dom2.2
8170
/usr/include/
82-
/usr/include/colladadom
83-
/usr/include/collada-dom
84-
/usr/include/collada-dom2.5
85-
/usr/include/collada-dom2.4
86-
/usr/include/collada-dom2.2
8771
/sw/include # Fink
8872
/opt/local/include # DarwinPorts
8973
/opt/csw/include # Blastwave
9074
/opt/include
9175
/usr/freeware/include
9276
${ACTUAL_3DPARTY_DIR}/include
77+
PATH_SUFFIXES
78+
colladadom
79+
collada-dom
80+
collada-dom2.5
81+
collada-dom2.4
82+
collada-dom2.2
9383
)
9484

9585
FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY
@@ -117,7 +107,7 @@ FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY
117107
)
118108

119109
FIND_LIBRARY(COLLADA_DYNAMIC_LIBRARY_DEBUG
120-
NAMES collada_dom-d collada14dom-d Collada14Dom-d libcollada14dom21-d libcollada14dom22-d collada-dom2.5-dp-d collada-dom2.5-dp-${COLLADA_BOOST_BUILDNAME}-mt-d collada-dom2.4-dp-d collada-dom2.4-dp-${COLLADA_BOOST_BUILDNAME}-mt-d
110+
NAMES collada_dom-d collada14dom-d Collada14Dom-d libcollada14dom21-d libcollada14dom22-d collada-dom2.5-dp-d collada-dom2.5-dp-${COLLADA_BOOST_BUILDNAME}-mt-d collada-dom2.4-dp-d collada-dom2.4-dp-${COLLADA_BOOST_BUILDNAME}-mt-d collada-dom2.5-dp-${COLLADA_BOOST_BUILDNAME}-mt
121111
PATHS
122112
${COLLADA_DOM_ROOT}/build/${COLLADA_BUILDNAME}-1.4-d
123113
${COLLADA_DOM_ROOT}
@@ -279,31 +269,31 @@ IF (COLLADA_STATIC_LIBRARY)
279269
)
280270

281271
FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY
282-
NAMES libboost_filesystem boost_filesystem boost_filesystem-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_55 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_63
272+
NAMES libboost_filesystem boost_filesystem boost_filesystem-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_55 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-1_63 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt
283273
PATHS
284274
${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
285275
${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
286276
${ACTUAL_3DPARTY_DIR}/lib
287277
)
288278

289279
FIND_LIBRARY(COLLADA_BOOST_FILESYSTEM_LIBRARY_DEBUG
290-
NAMES libboost_filesystem-d boost_filesystem-d boost_filesystem-mt-d libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_54 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_55 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_58 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_62 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_63
280+
NAMES libboost_filesystem-d boost_filesystem-d boost_filesystem-mt-d libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_54 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_55 libboost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_58 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_62 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_63 boost_filesystem-${COLLADA_BOOST_BUILDNAME}-mt-gd
291281
PATHS
292282
${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
293283
${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
294284
${ACTUAL_3DPARTY_DIR}/lib
295285
)
296286

297287
FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY
298-
NAMES libboost_system boost_system boost_system-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_55 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_63
288+
NAMES libboost_system boost_system boost_system-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_54 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_55 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_58 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_62 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-1_63 boost_system-${COLLADA_BOOST_BUILDNAME}-mt
299289
PATHS
300290
${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
301291
${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
302292
${ACTUAL_3DPARTY_DIR}/lib
303293
)
304294

305295
FIND_LIBRARY(COLLADA_BOOST_SYSTEM_LIBRARY_DEBUG
306-
NAMES libboost_system-d boost_system-d boost_system-mt-d libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_54 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_55 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_58 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_62 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_63
296+
NAMES libboost_system-d boost_system-d boost_system-mt-d libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_54 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_55 libboost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_58 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_62 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd-1_63 boost_system-${COLLADA_BOOST_BUILDNAME}-mt-gd
307297
PATHS
308298
${COLLADA_DOM_ROOT}/external-libs/boost/lib/${COLLADA_BUILDNAME}
309299
${COLLADA_DOM_ROOT}/external-libs/boost/lib/mingw
@@ -329,5 +319,3 @@ IF(COLLADA_DYNAMIC_LIBRARY OR COLLADA_STATIC_LIBRARY)
329319

330320
ENDIF()
331321
ENDIF()
332-
333-

‎CMakeModules/ModuleInstall.cmake‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,7 @@ INSTALL(
3333
)
3434

3535
IF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
36-
GET_TARGET_PROPERTY(PREFIX ${LIB_NAME} PREFIX)
37-
IF("${PREFIX}" STREQUAL PREFIX-NOTFOUND) # Fix for PREFIX-NOTFOUND left in file names
38-
SET(PREFIX "")
39-
ENDIF()
40-
IF ( ${CMAKE_GENERATOR} STREQUAL "Ninja" )
41-
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}${LIB_NAME}${CMAKE_RELEASE_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph CONFIGURATIONS Release)
42-
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}${LIB_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph CONFIGURATIONS RelWithDebInfo)
43-
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}${LIB_NAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph CONFIGURATIONS Debug)
44-
ELSE ( ${CMAKE_GENERATOR} STREQUAL "Ninja" )
45-
INSTALL(FILES ${OUTPUT_BINDIR}/${PREFIX}${LIB_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph CONFIGURATIONS RelWithDebInfo)
46-
INSTALL(FILES ${OUTPUT_BINDIR}/${PREFIX}${LIB_NAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenscenegraph CONFIGURATIONS Debug)
47-
ENDIF ( ${CMAKE_GENERATOR} STREQUAL "Ninja" )
36+
INSTALL(FILES $<TARGET_PDB_FILE:${LIB_NAME}> DESTINATION ${INSTALL_BINDIR} COMPONENT libopenthreads)
4837
ENDIF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
4938

5039
IF(NOT OSG_COMPILE_FRAMEWORKS)

‎CMakeModules/OsgMacroUtils.cmake‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -349,13 +349,7 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
349349
ARCHIVE DESTINATION lib/${OSG_PLUGINS} COMPONENT libopenscenegraph-dev
350350
LIBRARY DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT})
351351
IF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
352-
IF( ${CMAKE_GENERATOR} STREQUAL "Ninja" )
353-
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT} CONFIGURATIONS RelWithDebInfo)
354-
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${TARGET_TARGETNAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT} CONFIGURATIONS Debug)
355-
ELSE( ${CMAKE_GENERATOR} STREQUAL "Ninja" )
356-
INSTALL(FILES ${OUTPUT_BINDIR}/${OSG_PLUGINS}/${TARGET_TARGETNAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT} CONFIGURATIONS RelWithDebInfo)
357-
INSTALL(FILES ${OUTPUT_BINDIR}/${OSG_PLUGINS}/${TARGET_TARGETNAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT} CONFIGURATIONS Debug)
358-
ENDIF( ${CMAKE_GENERATOR} STREQUAL "Ninja" )
352+
INSTALL(FILES $<TARGET_PDB_FILE:${TARGET_TARGETNAME}> DESTINATION bin/${OSG_PLUGINS} COMPONENT ${PACKAGE_COMPONENT})
359353
ENDIF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
360354
ELSE(WIN32)
361355
INSTALL(TARGETS ${TARGET_TARGETNAME}
@@ -463,8 +457,7 @@ MACRO(SETUP_APPLICATION APPLICATION_NAME)
463457
ELSE(APPLE)
464458
INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION bin COMPONENT openscenegraph )
465459
IF(MSVC)
466-
INSTALL(FILES ${OUTPUT_BINDIR}/${TARGET_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION bin COMPONENT openscenegraph CONFIGURATIONS RelWithDebInfo)
467-
INSTALL(FILES ${OUTPUT_BINDIR}/${TARGET_NAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION bin COMPONENT openscenegraph CONFIGURATIONS Debug)
460+
INSTALL(FILES $<TARGET_PDB_FILE:${TARGET_NAME}> DESTINATION bin COMPONENT openscenegraph)
468461
ENDIF(MSVC)
469462
ENDIF(APPLE)
470463

@@ -496,8 +489,7 @@ MACRO(SETUP_EXAMPLE EXAMPLE_NAME)
496489
ELSE(APPLE)
497490
INSTALL(TARGETS ${TARGET_TARGETNAME} RUNTIME DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples )
498491
IF(MSVC)
499-
INSTALL(FILES ${OUTPUT_BINDIR}/${TARGET_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS RelWithDebInfo)
500-
INSTALL(FILES ${OUTPUT_BINDIR}/${TARGET_NAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples CONFIGURATIONS Debug)
492+
INSTALL(FILES $<TARGET_PDB_FILE:${TARGET_NAME}> DESTINATION share/OpenSceneGraph/bin COMPONENT openscenegraph-examples)
501493
ENDIF(MSVC)
502494
ENDIF(APPLE)
503495

‎include/osg/ref_ptr‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@ class ref_ptr
3636
ref_ptr() : _ptr(0) {}
3737
ref_ptr(T* ptr) : _ptr(ptr) { if (_ptr) _ptr->ref(); }
3838
ref_ptr(const ref_ptr& rp) : _ptr(rp._ptr) { if (_ptr) _ptr->ref(); }
39-
#if __cplusplus >= 201103L
4039
ref_ptr(ref_ptr&& rp) noexcept : _ptr(rp._ptr) { rp._ptr = 0; }
41-
#endif
4240
template<class Other> ref_ptr(const ref_ptr<Other>& rp) : _ptr(rp._ptr) { if (_ptr) _ptr->ref(); }
4341
ref_ptr(observer_ptr<T>& optr) : _ptr(0) { optr.lock(*this); }
4442
~ref_ptr() { if (_ptr) _ptr->unref(); _ptr = 0; }
@@ -55,7 +53,6 @@ class ref_ptr
5553
return *this;
5654
}
5755

58-
#if __cplusplus >= 201103L
5956
template<class Other> ref_ptr& operator = (ref_ptr<Other>&& rp)
6057
{
6158
if (_ptr == rp._ptr) return *this;
@@ -64,7 +61,6 @@ class ref_ptr
6461
rp._ptr = nullptr;
6562
return *this;
6663
}
67-
#endif
6864

6965
inline ref_ptr& operator = (T* ptr)
7066
{

‎src/OpenThreads/win32/CMakeLists.txt‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,18 +58,7 @@ INSTALL(
5858
)
5959

6060
IF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
61-
GET_TARGET_PROPERTY(PREFIX ${LIB_NAME} PREFIX)
62-
IF("${PREFIX}" STREQUAL PREFIX-NOTFOUND) # Fix for PREFIX-NOTFOUND left in file names
63-
SET(PREFIX "")
64-
ENDIF()
65-
IF( ${CMAKE_GENERATOR} STREQUAL "Ninja" )
66-
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}${LIB_NAME}${CMAKE_RELEASE_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenthreads CONFIGURATIONS Release)
67-
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}${LIB_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenthreads CONFIGURATIONS RelWithDebInfo)
68-
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PREFIX}${LIB_NAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenthreads CONFIGURATIONS Debug)
69-
ELSE( ${CMAKE_GENERATOR} STREQUAL "Ninja" )
70-
INSTALL(FILES ${OUTPUT_BINDIR}/${PREFIX}${LIB_NAME}${CMAKE_RELWITHDEBINFO_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenthreads CONFIGURATIONS RelWithDebInfo)
71-
INSTALL(FILES ${OUTPUT_BINDIR}/${PREFIX}${LIB_NAME}${CMAKE_DEBUG_POSTFIX}.pdb DESTINATION ${INSTALL_BINDIR} COMPONENT libopenthreads CONFIGURATIONS Debug)
72-
ENDIF( ${CMAKE_GENERATOR} STREQUAL "Ninja" )
61+
INSTALL(FILES $<TARGET_PDB_FILE:${LIB_NAME}> DESTINATION ${INSTALL_BINDIR} COMPONENT libopenthreads)
7362
ENDIF(MSVC AND DYNAMIC_OPENSCENEGRAPH)
7463

7564
#commented out# INCLUDE(ModuleInstall OPTIONAL)

‎src/osgPlugins/dae/CMakeLists.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@ ELSE()
4949
ENDIF()
5050

5151
ADD_DEFINITIONS(-DNO_BOOST)
52-
ADD_DEFINITIONS(-DCOLLADA_DOM_SUPPORT141)
52+
ADD_DEFINITIONS(-DCOLLADA_DOM_USING_141
53+
-DCOLLADA_DOM_SUPPORT141
54+
-DCOLLADA_DOM_SUPPORT150)
5355

5456
IF (COLLADA_DOM_2_4_OR_LATER)
5557
ADD_DEFINITIONS(-DCOLLADA_DOM_2_4_OR_LATER)

0 commit comments

Comments
 (0)