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

code/CMakeLists.txt

@@ -109,7 +109,7 @@ IF(WITH_STLPORT)
   IF(WIN32)
     FIND_PACKAGE(WindowsSDK REQUIRED)
     # 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
     INCLUDE_DIRECTORIES(${VC_INCLUDE_DIR} ${WINSDK_INCLUDE_DIR})
   ENDIF(WIN32)

code/CMakeModules/FindCustomMFC.cmake

@@ -11,7 +11,7 @@ SET(CUSTOM_MFC_DIR FALSE)
 
 # If using STLport and MFC have been found, remember its directory
 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)
 
 # If using STLport or MFC haven't been found, search for afxwin.h