sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

improve nmake detection

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@11443 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2009-08-19 19:09:10 +00:00
parent 80a9cef436
commit fdc629ce5d
2 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
cmake/Python.cmake
View File

@ -103,6 +103,19 @@ MACRO (TRY_RUN_PYTHON RESULT CMD)
ENDIF (PYTHONINTERP_FOUND)
ENDMACRO (TRY_RUN_PYTHON)
IF(MSVC)
FIND_PROGRAM(SIP_MAKE_PROGRAM
NAMES nmake.exe
PATHS "$ENV{VCINSTALLDIR}/bin" "$ENV{PROGRAMFILES}/Microsoft Visual 9.0/VC/bin"
)
IF(NOT SIP_MAKE_PROGRAM)
MESSAGE(FATAL_ERROR "nmake not found")
ENDIF(NOT SIP_MAKE_PROGRAM)
ELSE (MSVC)
SET(SIP_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM})
ENDIF (MSVC)
# enable/disable python support (mapserver export tool and bindings)
IF (PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
SET (PYTHON_FOUND TRUE)

5
python/CMakeLists.txt
View File

@ -42,7 +42,6 @@ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/configure.py.in
IF (MSVC)
SET(EXPORT "__declspec(dllimport)")
SET(CMAKE_MAKE_PROGRAM $ENV{VCINSTALLDIR}/bin/nmake.exe)
ELSE (MSVC)
SET(EXPORT "")
ENDIF (MSVC)
@ -60,11 +59,11 @@ ADD_CUSTOM_COMMAND(OUTPUT ${BINDINGS_CORE_MAKEFILE} ${BINDINGS_GUI_MAKEFILE} PRE
# Step 3: run make in core and gui subdirs
ADD_CUSTOM_COMMAND(OUTPUT ${BINDINGS_CORE_LIB} PRE_LINK
COMMAND ${CMAKE_MAKE_PROGRAM}
COMMAND ${SIP_MAKE_PROGRAM}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/core
DEPENDS ${BINDINGS_CORE_MAKEFILE})
ADD_CUSTOM_COMMAND(OUTPUT ${BINDINGS_GUI_LIB} PRE_LINK
COMMAND ${CMAKE_MAKE_PROGRAM}
COMMAND ${SIP_MAKE_PROGRAM}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gui
DEPENDS ${BINDINGS_GUI_MAKEFILE})