aleajactaest/khanat-opennel-code
1
0
Fork 0
mirror of https://port.numenaute.org/aleajactaest/khanat-opennel-code.git synced 2024-11-27 01:26:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed: Use of CMAKE_CXX_COMPILER instead of CMAKE_MAKE_PROGRAM because Jom is not installed in VC++ directory

Browse source
This commit is contained in:
kervala 2010-09-27 23:25:40 +02:00
parent cc804842c3
commit 7ce279972e
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/CMakeLists.txt
View file

@ -109,7 +109,7 @@ IF(WITH_STLPORT)
IF(WIN32) IF(WIN32)
FIND_PACKAGE(WindowsSDK REQUIRED) FIND_PACKAGE(WindowsSDK REQUIRED)
# convert IDE fullpath to include path # convert IDE fullpath to include path
STRING(REGEX REPLACE "Common7/IDE/.+" "VC/include" VC_INCLUDE_DIR ${CMAKE_MAKE_PROGRAM}) STRING(REGEX REPLACE "VC/bin/.+" "VC/include" VC_INCLUDE_DIR ${CMAKE_CXX_COMPILER})
# 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})
ENDIF(WIN32) ENDIF(WIN32)

2
code/CMakeModules/FindCustomMFC.cmake
View file

@ -11,7 +11,7 @@ SET(CUSTOM_MFC_DIR FALSE)
# If using STLport and MFC have been found, remember its directory # If using STLport and MFC have been found, remember its directory
IF(WITH_STLPORT AND MFC_FOUND) IF(WITH_STLPORT AND MFC_FOUND)
STRING(REGEX REPLACE "Common7/IDE/.+" "VC/atlmfc" MFC_STANDARD_DIR ${CMAKE_MAKE_PROGRAM}) STRING(REGEX REPLACE "VC/bin/.+" "VC/atlmfc" VC_INCLUDE_DIR ${CMAKE_CXX_COMPILER})
ENDIF(WITH_STLPORT AND MFC_FOUND) ENDIF(WITH_STLPORT AND MFC_FOUND)
# If using STLport or MFC haven't been found, search for afxwin.h # If using STLport or MFC haven't been found, search for afxwin.h