Skip to content

Commit d233cee

Browse files
author
jef
committed
improve nmake detection
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@11443 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 43216f9 commit d233cee

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

cmake/Python.cmake

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,19 @@ MACRO (TRY_RUN_PYTHON RESULT CMD)
103103
ENDIF (PYTHONINTERP_FOUND)
104104
ENDMACRO (TRY_RUN_PYTHON)
105105

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+
106119
# enable/disable python support (mapserver export tool and bindings)
107120
IF (PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
108121
SET (PYTHON_FOUND TRUE)

python/CMakeLists.txt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/configure.py.in
4242

4343
IF (MSVC)
4444
SET(EXPORT "__declspec(dllimport)")
45-
SET(CMAKE_MAKE_PROGRAM $ENV{VCINSTALLDIR}/bin/nmake.exe)
4645
ELSE (MSVC)
4746
SET(EXPORT "")
4847
ENDIF (MSVC)
@@ -60,11 +59,11 @@ ADD_CUSTOM_COMMAND(OUTPUT ${BINDINGS_CORE_MAKEFILE} ${BINDINGS_GUI_MAKEFILE} PRE
6059

6160
# Step 3: run make in core and gui subdirs
6261
ADD_CUSTOM_COMMAND(OUTPUT ${BINDINGS_CORE_LIB} PRE_LINK
63-
COMMAND ${CMAKE_MAKE_PROGRAM}
62+
COMMAND ${SIP_MAKE_PROGRAM}
6463
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/core
6564
DEPENDS ${BINDINGS_CORE_MAKEFILE})
6665
ADD_CUSTOM_COMMAND(OUTPUT ${BINDINGS_GUI_LIB} PRE_LINK
67-
COMMAND ${CMAKE_MAKE_PROGRAM}
66+
COMMAND ${SIP_MAKE_PROGRAM}
6867
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gui
6968
DEPENDS ${BINDINGS_GUI_MAKEFILE})
7069

0 commit comments

Comments
 (0)