1. Andrew Fenn
  2. ogreassimp

Commits

Andrew Fenn  committed a8a994e

Fixes for getting cmake working with dev builds of assimp

  • Participants
  • Parent commits a62f402
  • Branches default

Comments (0)

Files changed (3)

File CMakeLists.txt

View file
 
     else ()
       message(SEND_ERROR "Failed to find module path.")
-    endif(EXISTS "/usr/local/lib/OGRE")
+    endif()
 endif(UNIX)
 
 if (CMAKE_BUILD_TYPE STREQUAL "")

File CMakeModules/FindASSIMP.cmake

View file
 set(ASSIMP_LIBRARY_NAMES assimp)
 get_debug_names(ASSIMP_LIBRARY_NAMES)
 
-use_pkgconfig(ASSIMP_PKGC ASSIMP)
+use_pkgconfig(ASSIMP assimp)
 
 findpkg_framework(ASSIMP)
 

File src/AssimpLoader.cpp

View file
 THE SOFTWARE.
 -----------------------------------------------------------------------------
 */
-#include "AssimpLoader.h"
-#include "assimp/DefaultLogger.h"
+#include "assimp/Importer.hpp"
+#include "assimp/DefaultLogger.hpp"
 #include "OgreDataStream.h"
 #include "OgreImage.h"
 #include "OgreTexture.h"