Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtQuick3D-Assimp
Commits
5c6421d5
Commit
5c6421d5
authored
8 years ago
by
Kim Kulling
Browse files
Options
Download
Patches
Plain Diff
C++11: add option to select c++11 config.
parent
5bc73f7a
upstream/issue_992_ms2010_and_cpp11
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+4
-0
CMakeLists.txt
appveyor.yml
+3
-3
appveyor.yml
with
7 additions
and
3 deletions
CMakeLists.txt
+
4
−
0
View file @
5c6421d5
...
...
@@ -44,6 +44,10 @@ OPTION( BUILD_SHARED_LIBS
"Build package with shared libraries."
ON
)
OPTION
(
ASSIMP_USE_CPP11
"Enables C++11 support. Only disable this for older compilers without any C++11-support."
ON
)
OPTION
(
ASSIMP_DOUBLE_PRECISION
"Set to ON to enable double precision processing"
OFF
...
...
This diff is collapsed.
Click to expand it.
appveyor.yml
+
3
−
3
View file @
5c6421d5
...
...
@@ -12,13 +12,13 @@ branches:
platform
:
-
x86
-
x64
#
- x64
configuration
:
-
14
2015
-
12
2013
-
10
2010
# only works for x86
#- MinGW
#- 10 2010 # only works for x86
init
:
-
if "%platform%" EQU "x64" ( for %%a in (2008 2010 MinGW) do ( if "%Configuration%"=="%%a" (echo "Skipping unsupported configuration" && exit /b 1 ) ) )
...
...
@@ -30,7 +30,7 @@ install:
build_script
:
-
cd c:\projects\assimp
-
cmake CMakeLists.txt -G "Visual Studio %Configuration%"
-
msbuild /m /p:Configuration=Release /p:Platform="Win32" Assimp.sln
-
msbuild /m /p:Configuration=Release /p:Platform="Win32" Assimp.sln
-DASSIMP_USE_CPP11=OFF
after_build
:
-
7z a assimp.7z c:\projects\assimp\bin\release\* c:\projects\assimp\lib\release\*
...
...
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets