Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Fixed: New versions of AssImp depend on IrrXML

Browse source 
--HG--
branch : develop
This commit is contained in:
kervala 2017-10-03 14:33:25 +02:00
parent 450181f244
commit c9aa7142bc
2 changed files with 50 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
code/CMakeModules/Findassimp.cmake
View file

@ -1,29 +1,63 @@
IF(assimp_FIND_REQUIRED)
SET(ASSIMP_FIND_REQUIRED ON)
ENDIF()
FIND_PATH( FIND_PATH(
assimp_INCLUDE_DIRS ASSIMP_INCLUDE_DIRS
NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h NAMES assimp/postprocess.h assimp/scene.h assimp/version.h assimp/config.h assimp/cimport.h
PATHS /usr/local/include/ PATHS /usr/local/include/
) )
FIND_LIBRARY( FIND_LIBRARY(
assimp_LIBRARIES ASSIMP_LIBRARY_RELEASE
NAMES assimp NAMES assimp
PATHS /usr/local/lib/ PATHS /usr/local/lib/
) )
IF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES) FIND_LIBRARY(
SET(assimp_FOUND TRUE) IRRXML_LIBRARY_RELEASE
NAMES IrrXML
PATHS /usr/local/lib/
)
FIND_LIBRARY(
ASSIMP_LIBRARY_DEBUG
NAMES assimpd
PATHS /usr/local/lib/
)
FIND_LIBRARY(
IRRXML_LIBRARY_DEBUG
NAMES IrrXMLd
PATHS /usr/local/lib/
)
IF (ASSIMP_INCLUDE_DIRS)
SET(ASSIMP_FOUND TRUE)
IF(ASSIMP_LIBRARY_RELEASE)
SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} optimized ${ASSIMP_LIBRARY_RELEASE})
ENDIF()
IF(ASSIMP_LIBRARY_DEBUG)
SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} debug ${ASSIMP_LIBRARY_DEBUG})
ENDIF()
FIND_PACKAGE(ZLIB) FIND_PACKAGE(ZLIB)
IF(ZLIB_FOUND) IF(ZLIB_FOUND)
SET(assimp_LIBRARIES ${assimp_LIBRARIES} ${ZLIB_LIBRARIES}) SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} ${ZLIB_LIBRARIES})
ENDIF() ENDIF()
ENDIF (assimp_INCLUDE_DIRS AND assimp_LIBRARIES) IF(IRRXML_LIBRARY_RELEASE)
SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} optimized ${IRRXML_LIBRARY_RELEASE})
ENDIF()
IF(IRRXML_LIBRARY_DEBUG)
SET(ASSIMP_LIBRARIES ${ASSIMP_LIBRARIES} debug ${IRRXML_LIBRARY_DEBUG})
ENDIF()
ENDIF()
IF (assimp_FOUND) IF (ASSIMP_FOUND)
IF (NOT assimp_FIND_QUIETLY) IF (NOT ASSIMP_FIND_QUIETLY)
MESSAGE(STATUS "Found asset importer library: ${assimp_LIBRARIES}") MESSAGE(STATUS "Found asset importer library: ${ASSIMP_LIBRARIES}")
ENDIF (NOT assimp_FIND_QUIETLY) ENDIF ()
ELSE (assimp_FOUND) ELSE (ASSIMP_FOUND)
IF (assimp_FIND_REQUIRED) IF (ASSIMP_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find asset importer library") MESSAGE(FATAL_ERROR "Could not find asset importer library")
ENDIF (assimp_FIND_REQUIRED) ENDIF ()
ENDIF (assimp_FOUND) ENDIF ()

4
code/nel/tools/3d/mesh_utils/CMakeLists.txt
View file

@ -3,11 +3,11 @@ FILE(GLOB HDRS *.h)
SOURCE_GROUP("" FILES ${SRCS} ${HDRS}) SOURCE_GROUP("" FILES ${SRCS} ${HDRS})
INCLUDE_DIRECTORIES(${assimp_INCLUDE_DIRS}) INCLUDE_DIRECTORIES(${ASSIMP_INCLUDE_DIRS})
NL_TARGET_LIB(mesh_utils ${SRCS} ${HDRS}) NL_TARGET_LIB(mesh_utils ${SRCS} ${HDRS})
TARGET_LINK_LIBRARIES(mesh_utils ${assimp_LIBRARIES} nelmisc nelpipeline nel3d) TARGET_LINK_LIBRARIES(mesh_utils ${ASSIMP_LIBRARIES} nelmisc nelpipeline nel3d)
NL_DEFAULT_PROPS(mesh_utils "NeL, Tools, 3D: Mesh Utils") NL_DEFAULT_PROPS(mesh_utils "NeL, Tools, 3D: Mesh Utils")
NL_ADD_RUNTIME_FLAGS(mesh_utils) NL_ADD_RUNTIME_FLAGS(mesh_utils)