From 5c6921e2ea624c5b84b9bfee8842fae4acde0bf2 Mon Sep 17 00:00:00 2001 From: xantares Date: Thu, 27 Nov 2014 08:58:29 +0100 Subject: [PATCH] remove useless ASSIMP_BUILD_STATIC_LIB option BUILD_SHARED_LIBS must be used instead --- CMakeLists.txt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1c1f26e5..96614201c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,17 +78,11 @@ SET( ASSIMP_INCLUDE_INSTALL_DIR "include" CACHE PATH "Path the header files are installed to." ) SET( ASSIMP_BIN_INSTALL_DIR "bin" CACHE PATH "Path the tool executables are installed to." ) -option (ASSIMP_BUILD_STATIC_LIB "Build a static (.a) version of the library" OFF) SET(ASSIMP_DEBUG_POSTFIX "d" CACHE STRING "Debug Postfitx for lib, samples and tools") -# Allow the user to build a static library +# Allow the user to build a shared or static library option ( BUILD_SHARED_LIBS "Build a shared version of the library" ON ) -IF ( ASSIMP_BUILD_STATIC_LIB ) - option ( BUILD_SHARED_LIBS "Build a shared version of the library" OFF ) -ELSE ( ASSIMP_BUILD_STATIC_LIB ) - option ( BUILD_SHARED_LIBS "Build a shared version of the library" ON ) -ENDIF ( ASSIMP_BUILD_STATIC_LIB ) # Only generate this target if no higher-level project already has IF (NOT TARGET uninstall)