Small improvements in cmake status report

This commit is contained in:
Andrey Kamaev 2011-11-18 08:14:42 +00:00
parent a13dfc7f70
commit d45f561ef5

View File

@ -1679,9 +1679,18 @@ else()
endif() endif()
if(ANDROID) if(ANDROID)
status("")
status(" Android: ")
status(" Android ABI:" ${ANDROID_ABI}) status(" Android ABI:" ${ANDROID_ABI})
status(" Native API level:" android-${ANDROID_NATIVE_API_LEVEL}) status(" Native API level:" android-${ANDROID_NATIVE_API_LEVEL})
status(" SDK target:" "${ANDROID_SDK_TARGET}") status(" SDK target:" "${ANDROID_SDK_TARGET}")
if(BUILD_WITH_ANDROID_NDK)
status(" Android NDK:" "${ANDROID_NDK} (toolchain: ${ANDROID_TOOLCHAIN_NAME})")
elseif(BUILD_WITH_STANDALONE_TOOLCHAIN)
status(" Android toolchain:" "${ANDROID_STANDALONE_TOOLCHAIN}")
endif()
status(" android tool:" ANDROID_EXECUTABLE THEN "${ANDROID_EXECUTABLE} (${ANDROID_TOOLS_Pkg_Desc})" ELSE NO)
status(" ant:" ANT_EXECUTABLE THEN "${ANT_EXECUTABLE} (ver ${ANT_VERSION})" ELSE NO)
endif() endif()
#YV #YV
@ -1778,23 +1787,19 @@ endif()
status(" Use Cuda:" HAVE_CUDA THEN YES ELSE NO) status(" Use Cuda:" HAVE_CUDA THEN YES ELSE NO)
status(" Use Eigen:" HAVE_EIGEN THEN YES ELSE NO) status(" Use Eigen:" HAVE_EIGEN THEN YES ELSE NO)
status("")
status(" Python interpreter:" PYTHON_EXECUTABLE THEN "${PYTHON_EXECUTABLE} (ver ${PYTHON_VERSION_MAJOR_MINOR})" ELSE NO)
# interfaces to other languages # interfaces to other languages
status("") status("")
status(" Interfaces:") status(" Interfaces:")
status(" Python:" BUILD_NEW_PYTHON_SUPPORT THEN YES ELSE NO) status(" Python:" BUILD_NEW_PYTHON_SUPPORT THEN YES ELSE NO)
status(" Python interpreter:" PYTHON_EXECUTABLE THEN "${PYTHON_EXECUTABLE} (ver ${PYTHON_VERSION_MAJOR_MINOR})" ELSE NO) status(" Python numpy:" PYTHON_USE_NUMPY AND BUILD_NEW_PYTHON_SUPPORT THEN YES ELSE "NO (Python wrappers will not be generated)")
status(" Python numpy:" PYTHON_USE_NUMPY THEN YES ELSE "NO (Python wrappers will not be generated)")
if(ANDROID AND ANDROID_NATIVE_API_LEVEL LESS 8) if(ANDROID AND ANDROID_NATIVE_API_LEVEL LESS 8)
status(" Java:" "NO (Java API requires Android API level 8 or higher)") status(" Java:" "NO (Java API requires Android API level 8 or higher)")
else() else()
status(" Java:" BUILD_JAVA_SUPPORT THEN YES ELSE NO) status(" Java:" BUILD_JAVA_SUPPORT THEN YES ELSE NO)
endif() endif()
if(ANDROID)
status(" android tool:" ANDROID_EXECUTABLE THEN "${ANDROID_EXECUTABLE} (${ANDROID_TOOLS_Pkg_Desc})" ELSE NO)
status(" ant:" ANT_EXECUTABLE THEN "${ANT_EXECUTABLE} (ver ${ANT_VERSION})" ELSE NO)
endif()
# documentation # documentation
status("") status("")
status(" Documentation:") status(" Documentation:")