From 0e624054066fdf2befe79036d73d7ebc519f22a5 Mon Sep 17 00:00:00 2001 From: xantares Date: Mon, 21 Apr 2014 21:36:33 +0200 Subject: [PATCH 1/2] use standard BUILD_SHARED_LIB option. Install dll to /bin (mingw) --- CMakeLists.txt | 4 +--- code/CMakeLists.txt | 18 +++++++----------- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index afe0cea9b..ec5820265 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,9 +53,7 @@ SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE PATH SET(ASSIMP_DEBUG_POSTFIX "d" CACHE STRING "Debug Postfitx for lib, samples and tools") # Allow the user to build a static library -SET ( ASSIMP_BUILD_STATIC_LIB OFF CACHE BOOL - "Build a static (.a) version of the library" -) +option ( BUILD_SHARED_LIB "Build a shared version of the library" ON ) # Generate a pkg-config .pc for the Assimp library. CONFIGURE_FILE( "${PROJECT_SOURCE_DIR}/assimp.pc.in" "${PROJECT_BINARY_DIR}/assimp.pc" @ONLY ) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index 9d4f39cf2..29ed3ccff 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -681,15 +681,7 @@ SET( assimp_src ADD_MSVC_PRECOMPILED_HEADER("AssimpPCH.h" "AssimpPCH.cpp" assimp_src) -IF ( ASSIMP_BUILD_STATIC_LIB ) - ADD_LIBRARY( assimp STATIC - ${assimp_src} - ) -ELSE ( ASSIMP_BUILD_STATIC_LIB ) - ADD_LIBRARY( assimp SHARED - ${assimp_src} - ) -ENDIF ( ASSIMP_BUILD_STATIC_LIB ) +ADD_LIBRARY( assimp ${assimp_src} ) SET_PROPERTY(TARGET assimp PROPERTY DEBUG_POSTFIX ${ASSIMP_DEBUG_POSTFIX}) @@ -713,7 +705,11 @@ else (UNZIP_FOUND) INCLUDE_DIRECTORIES("../contrib/unzip") endif (UNZIP_FOUND) -INSTALL( TARGETS assimp DESTINATION ${ASSIMP_LIB_INSTALL_DIR} COMPONENT ${LIBASSIMP_COMPONENT}) +INSTALL( TARGETS assimp + LIBRARY DESTINATION ${ASSIMP_LIB_INSTALL_DIR} + ARCHIVE DESTINATION ${ASSIMP_LIB_INSTALL_DIR} + RUNTIME DESTINATION ${ASSIMP_BIN_INSTALL_DIR} + COMPONENT ${LIBASSIMP_COMPONENT}) INSTALL( FILES ${PUBLIC_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp COMPONENT assimp-dev) INSTALL( FILES ${COMPILER_HEADERS} DESTINATION ${ASSIMP_INCLUDE_INSTALL_DIR}/assimp/Compiler COMPONENT assimp-dev) @@ -726,4 +722,4 @@ if(MSVC AND ASSIMP_INSTALL_PDB) DESTINATION ${ASSIMP_LIB_INSTALL_DIR} CONFIGURATIONS RelWithDebInfo ) -endif () \ No newline at end of file +endif () From f48c8ecccefbf9ac652c1d2940cb9219c3315252 Mon Sep 17 00:00:00 2001 From: xantares Date: Mon, 21 Apr 2014 21:58:29 +0200 Subject: [PATCH 2/2] Fix for issue #177 with mingw --- include/assimp/types.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/assimp/types.h b/include/assimp/types.h index 604591402..cbbf8fff5 100644 --- a/include/assimp/types.h +++ b/include/assimp/types.h @@ -46,6 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #define AI_TYPES_H_INC // Some runtime headers +#include #include #include #include