File tree Expand file tree Collapse file tree 2 files changed +15
-3
lines changed Expand file tree Collapse file tree 2 files changed +15
-3
lines changed Original file line number Diff line number Diff line change @@ -103,6 +103,19 @@ MACRO (TRY_RUN_PYTHON RESULT CMD)
103
103
ENDIF (PYTHONINTERP_FOUND )
104
104
ENDMACRO (TRY_RUN_PYTHON )
105
105
106
+ IF (MSVC )
107
+ FIND_PROGRAM (SIP_MAKE_PROGRAM
108
+ NAMES nmake.exe
109
+ PATHS "$ENV{VCINSTALLDIR} /bin" "$ENV{PROGRAMFILES} /Microsoft Visual 9.0/VC/bin"
110
+ )
111
+ IF (NOT SIP_MAKE_PROGRAM )
112
+ MESSAGE (FATAL_ERROR "nmake not found" )
113
+ ENDIF (NOT SIP_MAKE_PROGRAM )
114
+ ELSE (MSVC )
115
+ SET (SIP_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM} )
116
+ ENDIF (MSVC )
117
+
118
+
106
119
# enable/disable python support (mapserver export tool and bindings)
107
120
IF (PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH )
108
121
SET (PYTHON_FOUND TRUE )
Original file line number Diff line number Diff line change @@ -42,7 +42,6 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/configure.py.in
42
42
43
43
IF (MSVC )
44
44
SET (EXPORT "__declspec(dllimport)" )
45
- SET (CMAKE_MAKE_PROGRAM $ENV{VCINSTALLDIR} /bin/nmake.exe )
46
45
ELSE (MSVC )
47
46
SET (EXPORT "" )
48
47
ENDIF (MSVC )
@@ -60,11 +59,11 @@ ADD_CUSTOM_COMMAND(OUTPUT ${BINDINGS_CORE_MAKEFILE} ${BINDINGS_GUI_MAKEFILE} PRE
60
59
61
60
# Step 3: run make in core and gui subdirs
62
61
ADD_CUSTOM_COMMAND (OUTPUT ${BINDINGS_CORE_LIB} PRE_LINK
63
- COMMAND ${CMAKE_MAKE_PROGRAM }
62
+ COMMAND ${SIP_MAKE_PROGRAM }
64
63
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} /core
65
64
DEPENDS ${BINDINGS_CORE_MAKEFILE} )
66
65
ADD_CUSTOM_COMMAND (OUTPUT ${BINDINGS_GUI_LIB} PRE_LINK
67
- COMMAND ${CMAKE_MAKE_PROGRAM }
66
+ COMMAND ${SIP_MAKE_PROGRAM }
68
67
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} /gui
69
68
DEPENDS ${BINDINGS_GUI_MAKEFILE} )
70
69
You can’t perform that action at this time.
0 commit comments