mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-11-10 01:09:50 +00:00
Changed: Make some options less verbose (MFC and Libwww)
This commit is contained in:
parent
b9d24855ec
commit
9ad779931b
5 changed files with 18 additions and 6 deletions
|
@ -60,6 +60,7 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
|
|||
|
||||
IF(WIN32)
|
||||
FIND_PACKAGE(External REQUIRED)
|
||||
FIND_PACKAGE(MFC QUIET)
|
||||
|
||||
IF(NOT DEFINED ENV{QTDIR})
|
||||
SET(ENV{QTDIR} "c:/qt/4.6.3")
|
||||
|
|
|
@ -40,7 +40,8 @@ ENDIF(WITH_STLPORT OR NOT MFC_FOUND)
|
|||
# Only if using a custom path
|
||||
IF(CUSTOM_MFC_DIR)
|
||||
IF(NOT CMAKE_SIZEOF_VOID_P)
|
||||
MESSAGE(FATAL_ERROR "Size of void* is not set, you should call PROJECT(...) before")
|
||||
INCLUDE (CheckTypeSize)
|
||||
CHECK_TYPE_SIZE("void*" CMAKE_SIZEOF_VOID_P)
|
||||
ENDIF(NOT CMAKE_SIZEOF_VOID_P)
|
||||
|
||||
# Using 32 or 64 bits libraries
|
||||
|
|
|
@ -30,6 +30,11 @@ ENDMACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME)
|
|||
IF(DXSDK_DIR)
|
||||
SET(DXSDK_INCLUDE_DIR "${DXSDK_DIR}/Include")
|
||||
|
||||
IF(NOT CMAKE_SIZEOF_VOID_P)
|
||||
INCLUDE (CheckTypeSize)
|
||||
CHECK_TYPE_SIZE("void*" CMAKE_SIZEOF_VOID_P)
|
||||
ENDIF(NOT CMAKE_SIZEOF_VOID_P)
|
||||
|
||||
IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
SET(DXSDK_LIBRARY_DIR "${DXSDK_DIR}/Lib/x64")
|
||||
ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
||||
|
|
|
@ -6,6 +6,8 @@
|
|||
# LIBWWW_LIBRARY, where to find the LibWWW library.
|
||||
# LIBWWW_FOUND, If false, do not try to use LibWWW.
|
||||
|
||||
SET(LIBWWW_FIND_QUIETLY ${Libwww_FIND_QUIETLY})
|
||||
|
||||
# also defined, but not for general use are
|
||||
IF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR)
|
||||
# in cache already
|
||||
|
@ -61,9 +63,12 @@ MACRO(FIND_WWW_LIBRARY MYLIBRARY)
|
|||
IF(${MYLIBRARY})
|
||||
SET(LIBWWW_LIBRARIES ${LIBWWW_LIBRARIES} ${${MYLIBRARY}})
|
||||
ELSE(${MYLIBRARY})
|
||||
IF(NOT LIBWWW_FIND_QUIETLY)
|
||||
MESSAGE(STATUS "Warning: Libwww: Library not found: ${MYLIBRARY}")
|
||||
ENDIF(NOT LIBWWW_FIND_QUIETLY)
|
||||
ENDIF(${MYLIBRARY})
|
||||
|
||||
MARK_AS_ADVANCED(${MYLIBRARY})
|
||||
ENDMACRO(FIND_WWW_LIBRARY MYLIBRARY)
|
||||
|
||||
# on eg. mac os x and arch linux, libwww sub libraries are not "inter-linked"
|
||||
|
|
|
@ -173,11 +173,11 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
|
|||
OPTION(WITH_GTK "With GTK Support" OFF)
|
||||
OPTION(WITH_QT "With QT Support" OFF)
|
||||
|
||||
IF(WIN32)
|
||||
IF(WIN32 AND MFC_FOUND)
|
||||
OPTION(WITH_MFC "With MFC Support" ON )
|
||||
ELSE(WIN32)
|
||||
ELSE(WIN32 AND MFC_FOUND)
|
||||
OPTION(WITH_MFC "With MFC Support" OFF)
|
||||
ENDIF(WIN32)
|
||||
ENDIF(WIN32 AND MFC_FOUND)
|
||||
|
||||
###
|
||||
# Optional support
|
||||
|
|
Loading…
Reference in a new issue