aleajactaest/khanat-code-old
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-code-old.git synced 2024-11-26 16:56:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Changed: Make some options less verbose (MFC and Libwww)

Browse source
This commit is contained in:
kervala 2010-09-28 10:49:30 +02:00
parent 056d087280
commit fdd2259694
5 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/CMakeLists.txt
View file

@ -60,6 +60,7 @@ SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
IF(WIN32) IF(WIN32)
FIND_PACKAGE(External REQUIRED) FIND_PACKAGE(External REQUIRED)
FIND_PACKAGE(MFC QUIET)
IF(NOT DEFINED ENV{QTDIR}) IF(NOT DEFINED ENV{QTDIR})
SET(ENV{QTDIR} "c:/qt/4.6.3") SET(ENV{QTDIR} "c:/qt/4.6.3")

3
code/CMakeModules/FindCustomMFC.cmake
View file

@ -40,7 +40,8 @@ ENDIF(WITH_STLPORT OR NOT MFC_FOUND)
# Only if using a custom path # Only if using a custom path
IF(CUSTOM_MFC_DIR) IF(CUSTOM_MFC_DIR)
IF(NOT CMAKE_SIZEOF_VOID_P) 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) ENDIF(NOT CMAKE_SIZEOF_VOID_P)
# Using 32 or 64 bits libraries # Using 32 or 64 bits libraries

5
code/CMakeModules/FindDirectXSDK.cmake
View file

@ -30,6 +30,11 @@ ENDMACRO(FIND_DXSDK_LIBRARY MYLIBRARY MYLIBRARYNAME)
IF(DXSDK_DIR) IF(DXSDK_DIR)
SET(DXSDK_INCLUDE_DIR "${DXSDK_DIR}/Include") 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) IF(CMAKE_SIZEOF_VOID_P EQUAL 8)
SET(DXSDK_LIBRARY_DIR "${DXSDK_DIR}/Lib/x64") SET(DXSDK_LIBRARY_DIR "${DXSDK_DIR}/Lib/x64")
ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8) ELSE(CMAKE_SIZEOF_VOID_P EQUAL 8)

5
code/CMakeModules/FindLibwww.cmake
View file

@ -6,6 +6,8 @@
# LIBWWW_LIBRARY, where to find the LibWWW library. # LIBWWW_LIBRARY, where to find the LibWWW library.
# LIBWWW_FOUND, If false, do not try to use LibWWW. # 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 # also defined, but not for general use are
IF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR) IF(LIBWWW_LIBRARY AND LIBWWW_INCLUDE_DIR)
# in cache already # in cache already
@ -61,9 +63,12 @@ MACRO(FIND_WWW_LIBRARY MYLIBRARY)
IF(${MYLIBRARY}) IF(${MYLIBRARY})
SET(LIBWWW_LIBRARIES ${LIBWWW_LIBRARIES} ${${MYLIBRARY}}) SET(LIBWWW_LIBRARIES ${LIBWWW_LIBRARIES} ${${MYLIBRARY}})
ELSE(${MYLIBRARY}) ELSE(${MYLIBRARY})
IF(NOT LIBWWW_FIND_QUIETLY)
MESSAGE(STATUS "Warning: Libwww: Library not found: ${MYLIBRARY}") MESSAGE(STATUS "Warning: Libwww: Library not found: ${MYLIBRARY}")
ENDIF(NOT LIBWWW_FIND_QUIETLY)
ENDIF(${MYLIBRARY}) ENDIF(${MYLIBRARY})
MARK_AS_ADVANCED(${MYLIBRARY})
ENDMACRO(FIND_WWW_LIBRARY MYLIBRARY) ENDMACRO(FIND_WWW_LIBRARY MYLIBRARY)
# on eg. mac os x and arch linux, libwww sub libraries are not "inter-linked" # on eg. mac os x and arch linux, libwww sub libraries are not "inter-linked"

6
code/CMakeModules/nel.cmake
View file

@ -173,11 +173,11 @@ MACRO(NL_SETUP_DEFAULT_OPTIONS)
OPTION(WITH_GTK "With GTK Support" OFF) OPTION(WITH_GTK "With GTK Support" OFF)
OPTION(WITH_QT "With QT Support" OFF) OPTION(WITH_QT "With QT Support" OFF)
IF(WIN32) IF(WIN32 AND MFC_FOUND)
OPTION(WITH_MFC "With MFC Support" ON ) OPTION(WITH_MFC "With MFC Support" ON )
ELSE(WIN32) ELSE(WIN32 AND MFC_FOUND)
OPTION(WITH_MFC "With MFC Support" OFF) OPTION(WITH_MFC "With MFC Support" OFF)
ENDIF(WIN32) ENDIF(WIN32 AND MFC_FOUND)
### ###
# Optional support # Optional support