v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2414 from assimp/kimkulling-dev-2 

closes https://github.com/assimp/assimp/issues/2411: Revert parts of dynamic ixxxml linkage
pull/2420/head
Kim Kulling 2019-04-08 21:24:28 +02:00 committed by GitHub
parent d3d98a7ec0 dbd0f06d32
commit d72c8e9c22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/irrXML/CMakeLists.txt
View File

@ -13,7 +13,11 @@ if ( MSVC )
ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS ) ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
endif ( MSVC ) endif ( MSVC )
IF(CMAKE_SYSTEM_NAME MATCHES "(Darwin|FreeBSD)")
add_library(IrrXML ${IrrXML_SRCS}) add_library(IrrXML ${IrrXML_SRCS})
ELSE()
add_library(IrrXML STATIC ${IrrXML_SRCS})
ENDIF()
set(IRRXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "IrrXML_Include" ) set(IRRXML_INCLUDE_DIR "${CMAKE_CURRENT_SOURCE_DIR}" CACHE INTERNAL "IrrXML_Include" )
set(IRRXML_LIBRARY "IrrXML" CACHE INTERNAL "IrrXML" ) set(IRRXML_LIBRARY "IrrXML" CACHE INTERNAL "IrrXML" )