edfaaed56f
The following changes were tested against building with a master copy. For a more detailed report, please read the followings below: The flags that were checked were the ones checked by default + the following: ASSIMP_BUILD_ASSIMP_VIEW ASSIMP_BUILD_SAMPLES The list of compilable projects in Visual Studio were the following: - assimp - assimp_cmd - assimp_simpleogl - assimp_simpletextureddirectx11 - assimp_simpletexturedogl - assimp_viewer - INSTALL - IrrXML - uninstall - unit - UpdateAssimpLibsDebugSymbolsAndDLLs - ZERO_CHECK - zlib - zlibstatic The solution that was generated with the new changes comprised the same number of projects as the one from the master, unmodified. All projects except UpdateAssimpLibsDebugSymbolsAndDLLs were built without any error. All tests were run. UpdateAssimpLibsDebugSymbolsAndDLLs could not be built because of the reasons explained in issue #3004.
47 lines
1.3 KiB
CMake
47 lines
1.3 KiB
CMake
FIND_PACKAGE(DirectX)
|
|
|
|
IF ( MSVC )
|
|
SET(M_LIB)
|
|
ENDIF ()
|
|
|
|
if ( MSVC )
|
|
ADD_DEFINITIONS( -D_SCL_SECURE_NO_WARNINGS )
|
|
ADD_DEFINITIONS( -D_CRT_SECURE_NO_WARNINGS )
|
|
REMOVE_DEFINITIONS( -DUNICODE -D_UNICODE )
|
|
endif ()
|
|
|
|
INCLUDE_DIRECTORIES(
|
|
${Assimp_SOURCE_DIR}/include
|
|
${Assimp_SOURCE_DIR}/code
|
|
${OPENGL_INCLUDE_DIR}
|
|
${GLUT_INCLUDE_DIR}
|
|
${Assimp_SOURCE_DIR}/samples/freeglut/include
|
|
)
|
|
|
|
LINK_DIRECTORIES(
|
|
${Assimp_BINARY_DIR}
|
|
${Assimp_BINARY_DIR}/lib
|
|
)
|
|
|
|
ADD_EXECUTABLE( assimp_simpletextureddirectx11 WIN32
|
|
SimpleTexturedDirectx11/Mesh.h
|
|
SimpleTexturedDirectx11/ModelLoader.cpp
|
|
SimpleTexturedDirectx11/ModelLoader.h
|
|
#SimpleTexturedDirectx11/PixelShader.hlsl
|
|
SimpleTexturedDirectx11/TextureLoader.cpp
|
|
SimpleTexturedDirectx11/TextureLoader.h
|
|
#SimpleTexturedDirectx11/VertexShader.hlsl
|
|
SimpleTexturedDirectx11/main.cpp
|
|
)
|
|
|
|
SET_PROPERTY(TARGET assimp_simpletextureddirectx11 PROPERTY DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX})
|
|
|
|
TARGET_LINK_LIBRARIES( assimp_simpletextureddirectx11 assimp ${DirectX_LIBRARY} comctl32.lib winmm.lib )
|
|
SET_TARGET_PROPERTIES( assimp_simpletextureddirectx11 PROPERTIES
|
|
OUTPUT_NAME assimp_simpletextureddirectx11
|
|
)
|
|
|
|
INSTALL( TARGETS assimp_simpletextureddirectx11
|
|
DESTINATION "${ASSIMP_BIN_INSTALL_DIR}" COMPONENT assimp-dev
|
|
)
|