From 6551fd4903628bef69f5d7bbd0f0f5b262f32d2e Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Wed, 17 Apr 2013 18:47:52 -0700 Subject: [PATCH 1/4] Update material.inl aiMaterial::AddProperty template specializations are used by import methods in B3DImporter and SceneProcessor; they should be defined accordingly even when ASSIMP_BUILD_NO_EXPORT is defined. --- include/assimp/material.inl | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/assimp/material.inl b/include/assimp/material.inl index e2f3edb65..5e9051f4e 100644 --- a/include/assimp/material.inl +++ b/include/assimp/material.inl @@ -176,8 +176,6 @@ inline aiReturn aiMaterial::Get(const char* pKey,unsigned int type, } -#ifndef ASSIMP_BUILD_NO_EXPORT - // --------------------------------------------------------------------------- template aiReturn aiMaterial::AddProperty (const TYPE* pInput, @@ -269,8 +267,6 @@ inline aiReturn aiMaterial::AddProperty (const int* pInput, pKey,type,index,aiPTI_Integer); } -#endif - //! @endcond #endif //! AI_MATERIAL_INL_INC From 540265f6178228404ac275b0dc15fba1b04fd8ef Mon Sep 17 00:00:00 2001 From: Alexander Gessler Date: Fri, 19 Apr 2013 01:37:41 +0300 Subject: [PATCH 2/4] - update travis.yml to also test compilation without the export part. --- .travis.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3ecaa5704..cc5168b89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,11 +2,19 @@ before_install: - sudo apt-get install cmake before_script: - - cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES + - cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT + +env: + - TRAVIS_NO_EXPORT=YES + - TRAVIS_NO_EXPORT=NO language: cpp + compiler: - gcc - clang + script: make + + From a81c10265a02613341fe9f4949c33135b42700e0 Mon Sep 17 00:00:00 2001 From: Alexander Gessler Date: Fri, 19 Apr 2013 01:40:02 +0300 Subject: [PATCH 3/4] - update travis.yml to also test compilation without the export part (2nd try). --- .travis.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index cc5168b89..9a6bd1889 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,6 @@ before_install: - sudo apt-get install cmake -before_script: - - cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT - env: - TRAVIS_NO_EXPORT=YES - TRAVIS_NO_EXPORT=NO @@ -14,7 +11,7 @@ compiler: - gcc - clang -script: make +script: - cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT && make From a2541a898401e98cd0c4e0a42e3f89e0cc9f3be8 Mon Sep 17 00:00:00 2001 From: Alexander Gessler Date: Fri, 19 Apr 2013 01:41:45 +0300 Subject: [PATCH 4/4] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9a6bd1889..e969f86c2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,7 @@ compiler: - gcc - clang -script: - cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT && make +script: cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT && make