mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-11 20:34:47 +00:00
Fixed: Bad detection of MFC
This commit is contained in:
parent
fbbb7e1d30
commit
9d5fef3491
2 changed files with 13 additions and 8 deletions
|
@ -59,8 +59,9 @@ SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR}/bin)
|
||||||
SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
|
SET(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR}/lib)
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
FIND_PACKAGE(External REQUIRED)
|
IF(WITH_MFC)
|
||||||
FIND_PACKAGE(MFC QUIET)
|
FIND_PACKAGE(MFC QUIET)
|
||||||
|
ENDIF(WITH_MFC)
|
||||||
|
|
||||||
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")
|
||||||
|
@ -86,15 +87,12 @@ ENDIF(NOT WIN32)
|
||||||
#-----------------------------------------------------------------------------
|
#-----------------------------------------------------------------------------
|
||||||
#Platform specifics
|
#Platform specifics
|
||||||
|
|
||||||
FIND_PACKAGE(Threads REQUIRED)
|
|
||||||
FIND_PACKAGE(LibXml2 REQUIRED)
|
|
||||||
FIND_PACKAGE(PNG REQUIRED)
|
|
||||||
FIND_PACKAGE(Jpeg)
|
|
||||||
|
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
|
INCLUDE(${CMAKE_ROOT}/Modules/Platform/Windows-cl.cmake)
|
||||||
SET(WINSOCK2_LIB ws2_32.lib)
|
SET(WINSOCK2_LIB ws2_32.lib)
|
||||||
|
|
||||||
|
FIND_PACKAGE(External REQUIRED)
|
||||||
|
|
||||||
IF(${CMAKE_MAKE_PROGRAM} MATCHES "Common7")
|
IF(${CMAKE_MAKE_PROGRAM} MATCHES "Common7")
|
||||||
# convert IDE fullpath to VC++ path
|
# convert IDE fullpath to VC++ path
|
||||||
STRING(REGEX REPLACE "Common7/IDE/.+" "VC" VC_DIR ${CMAKE_MAKE_PROGRAM})
|
STRING(REGEX REPLACE "Common7/IDE/.+" "VC" VC_DIR ${CMAKE_MAKE_PROGRAM})
|
||||||
|
@ -102,13 +100,17 @@ IF(WIN32)
|
||||||
# convert compiler fullpath to VC++ path
|
# convert compiler fullpath to VC++ path
|
||||||
STRING(REGEX REPLACE "VC/bin/.+" "VC" VC_DIR ${CMAKE_CXX_COMPILER})
|
STRING(REGEX REPLACE "VC/bin/.+" "VC" VC_DIR ${CMAKE_CXX_COMPILER})
|
||||||
ENDIF(${CMAKE_MAKE_PROGRAM} MATCHES "Common7")
|
ENDIF(${CMAKE_MAKE_PROGRAM} MATCHES "Common7")
|
||||||
SET(VC_INCLUDE_DIR "${VC_DIR}/include")
|
|
||||||
|
|
||||||
IF(WITH_MFC)
|
IF(WITH_MFC)
|
||||||
FIND_PACKAGE(CustomMFC REQUIRED)
|
FIND_PACKAGE(CustomMFC REQUIRED)
|
||||||
ENDIF(WITH_MFC)
|
ENDIF(WITH_MFC)
|
||||||
ENDIF(WIN32)
|
ENDIF(WIN32)
|
||||||
|
|
||||||
|
FIND_PACKAGE(Threads REQUIRED)
|
||||||
|
FIND_PACKAGE(LibXml2 REQUIRED)
|
||||||
|
FIND_PACKAGE(PNG REQUIRED)
|
||||||
|
FIND_PACKAGE(Jpeg)
|
||||||
|
|
||||||
IF(WITH_STATIC)
|
IF(WITH_STATIC)
|
||||||
# libxml2 could need winsock2 library
|
# libxml2 could need winsock2 library
|
||||||
SET(LIBXML2_DEFINITIONS ${LIBXML2_DEFINITIONS} -DLIBXML_STATIC)
|
SET(LIBXML2_DEFINITIONS ${LIBXML2_DEFINITIONS} -DLIBXML_STATIC)
|
||||||
|
@ -119,6 +121,8 @@ IF(WITH_STLPORT)
|
||||||
FIND_PACKAGE(STLport REQUIRED)
|
FIND_PACKAGE(STLport REQUIRED)
|
||||||
INCLUDE_DIRECTORIES(${STLPORT_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${STLPORT_INCLUDE_DIR})
|
||||||
IF(WIN32)
|
IF(WIN32)
|
||||||
|
SET(VC_INCLUDE_DIR "${VC_DIR}/include")
|
||||||
|
|
||||||
FIND_PACKAGE(WindowsSDK REQUIRED)
|
FIND_PACKAGE(WindowsSDK REQUIRED)
|
||||||
# use VC++ and Windows SDK include paths
|
# use VC++ and Windows SDK include paths
|
||||||
INCLUDE_DIRECTORIES(${VC_INCLUDE_DIR} ${WINSDK_INCLUDE_DIR})
|
INCLUDE_DIRECTORIES(${VC_INCLUDE_DIR} ${WINSDK_INCLUDE_DIR})
|
||||||
|
|
|
@ -28,6 +28,7 @@ IF(WITH_STLPORT OR NOT MFC_FOUND)
|
||||||
|
|
||||||
# Display an error message if MFC are not found, MFC_FOUND is updated
|
# Display an error message if MFC are not found, MFC_FOUND is updated
|
||||||
# User will be able to update MFC_DIR to the correct directory
|
# User will be able to update MFC_DIR to the correct directory
|
||||||
|
INCLUDE(FindPackageHandleStandardArgs)
|
||||||
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MFC DEFAULT_MSG MFC_DIR)
|
FIND_PACKAGE_HANDLE_STANDARD_ARGS(MFC DEFAULT_MSG MFC_DIR)
|
||||||
|
|
||||||
IF(MFC_FOUND)
|
IF(MFC_FOUND)
|
||||||
|
|
Loading…
Reference in a new issue