From 4f902faddf9c668dac8477cd2bf779f817b275dc Mon Sep 17 00:00:00 2001 From: Kim Kulling Date: Sat, 2 May 2020 21:08:24 +0200 Subject: [PATCH] build: move option for viewer to the other options. --- CMakeLists.txt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c631b7685..da0ddeaa5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -134,6 +134,12 @@ OPTION ( ASSIMP_IGNORE_GIT_HASH OFF ) +IF ( WIN32 ) + OPTION ( ASSIMP_BUILD_ASSIMP_VIEW + "If the Assimp view tool is built. (requires DirectX)" + OFF ) +ENDIF() + IF (IOS AND NOT ASSIMP_HUNTER_ENABLED) IF (NOT CMAKE_BUILD_TYPE) SET(CMAKE_BUILD_TYPE "Release") @@ -512,19 +518,19 @@ ENDIF() SET ( ASSIMP_BUILD_ARCHITECTURE "" CACHE STRING "describe the current architecture." ) -IF ( ASSIMP_BUILD_ARCHITECTURE STREQUAL "") -ELSE () +IF( ASSIMP_BUILD_ARCHITECTURE STREQUAL "") +ELSE() ADD_DEFINITIONS ( -D'ASSIMP_BUILD_ARCHITECTURE="${ASSIMP_BUILD_ARCHITECTURE}"' ) -ENDIF () +ENDIF()) # ${CMAKE_GENERATOR} SET ( ASSIMP_BUILD_COMPILER "" CACHE STRING "describe the current compiler." ) -IF ( ASSIMP_BUILD_COMPILER STREQUAL "") -ELSE () +IF( ASSIMP_BUILD_COMPILER STREQUAL "") +ELSE() ADD_DEFINITIONS ( -D'ASSIMP_BUILD_COMPILER="${ASSIMP_BUILD_COMPILER}"' ) -ENDIF () +ENDIF() MARK_AS_ADVANCED ( ASSIMP_BUILD_ARCHITECTURE ASSIMP_BUILD_COMPILER )