From fabb251458f4a2d6d4f87dd36038fac2774b378c Mon Sep 17 00:00:00 2001 From: Marijn Tamis Date: Fri, 20 Oct 2017 14:30:56 +0200 Subject: NvCloth 1.1.3 Release. (23014067) --- .../src/compiler/cmake/Android/PsFastXml.cmake | 26 +++++----------------- 1 file changed, 5 insertions(+), 21 deletions(-) (limited to 'PxShared/src/compiler/cmake/Android/PsFastXml.cmake') diff --git a/PxShared/src/compiler/cmake/Android/PsFastXml.cmake b/PxShared/src/compiler/cmake/Android/PsFastXml.cmake index 81d356e..f5dce60 100644 --- a/PxShared/src/compiler/cmake/Android/PsFastXml.cmake +++ b/PxShared/src/compiler/cmake/Android/PsFastXml.cmake @@ -10,28 +10,12 @@ SET(LL_SOURCE_DIR ${PXSHARED_SOURCE_DIR}/fastxml) SET(PSFASTXML_COMPILE_DEFS # Common to all configurations ${PXSHARED_ANDROID_COMPILE_DEFS};PX_FOUNDATION_DLL=0;PxShared_STATIC_LIB; -) - -if(${CMAKE_BUILD_TYPE_LOWERCASE} STREQUAL "debug") - LIST(APPEND PSFASTXML_COMPILE_DEFS - ${PXSHARED_ANDROID_DEBUG_COMPILE_DEFS} - ) -elseif(${CMAKE_BUILD_TYPE_LOWERCASE} STREQUAL "checked") - LIST(APPEND PSFASTXML_COMPILE_DEFS - ${PXSHARED_ANDROID_CHECKED_COMPILE_DEFS} - ) -elseif(${CMAKE_BUILD_TYPE_LOWERCASE} STREQUAL "profile") - LIST(APPEND PSFASTXML_COMPILE_DEFS - ${PXSHARED_ANDROID_PROFILE_COMPILE_DEFS} - ) -elseif(${CMAKE_BUILD_TYPE_LOWERCASE} STREQUAL release) - LIST(APPEND PSFASTXML_COMPILE_DEFS - ${PXSHARED_ANDROID_RELEASE_COMPILE_DEFS} - ) -else(${CMAKE_BUILD_TYPE_LOWERCASE} STREQUAL "debug") - MESSAGE(FATAL_ERROR "Unknown configuration ${CMAKE_BUILD_TYPE}") -endif(${CMAKE_BUILD_TYPE_LOWERCASE} STREQUAL "debug") + $<$:${PXSHARED_ANDROID_DEBUG_COMPILE_DEFS};> + $<$:${PXSHARED_ANDROID_CHECKED_COMPILE_DEFS};> + $<$:${PXSHARED_ANDROID_PROFILE_COMPILE_DEFS};> + $<$:${PXSHARED_ANDROID_RELEASE_COMPILE_DEFS};> +) # include PsFastXml common INCLUDE(../common/PsFastXml.cmake) -- cgit v1.2.3