Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 25f30632 authored by hhakim's avatar hhakim
Browse files

Fix bug with matlab environment probing on Windows.

When architecture is AMD64 or x86 MEX_SUBDIR_LIB wasn't set, leading to a compilation error later.
parent f77381ad
No related branches found
No related tags found
No related merge requests found
...@@ -213,11 +213,12 @@ if( ${MATLAB_DIR_TMP} MATCHES "matlab") ...@@ -213,11 +213,12 @@ if( ${MATLAB_DIR_TMP} MATCHES "matlab")
elseif(WIN32) elseif(WIN32)
# METHODE 1 (without using matlab) # METHODE 1 (without using matlab)
#methode sure #methode sure
if ("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "AMD64") # first and second alternatives are commented out because they don't define MEX_SUBDIR_LIB
set(MEX_EXT "mexw64") # if ("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "AMD64")
elseif ("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "x86") # set(MEX_EXT "mexw64")
set(MEX_EXT "mexw32") # elseif ("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "x86")
else() # set(MEX_EXT "mexw32")
# else()
execute_process(COMMAND ${PROJECT_SOURCE_DIR}/CMake/matlab_arch.bat "2" "${MATLAB_ROOT}" OUTPUT_VARIABLE MEX_SUBDIR_LIB) execute_process(COMMAND ${PROJECT_SOURCE_DIR}/CMake/matlab_arch.bat "2" "${MATLAB_ROOT}" OUTPUT_VARIABLE MEX_SUBDIR_LIB)
string(REGEX REPLACE "\n" "" MEX_SUBDIR_LIB ${MEX_SUBDIR_LIB}) string(REGEX REPLACE "\n" "" MEX_SUBDIR_LIB ${MEX_SUBDIR_LIB})
if ("${MEX_SUBDIR_LIB}" STREQUAL "win64") if ("${MEX_SUBDIR_LIB}" STREQUAL "win64")
...@@ -231,7 +232,7 @@ if( ${MATLAB_DIR_TMP} MATCHES "matlab") ...@@ -231,7 +232,7 @@ if( ${MATLAB_DIR_TMP} MATCHES "matlab")
else() else()
message(WARNING "No extension for mex function is available. (see ./CMAke/findMatlab.cmake)") message(WARNING "No extension for mex function is available. (see ./CMAke/findMatlab.cmake)")
endif("${MEX_SUBDIR_LIB}" STREQUAL "win64") endif("${MEX_SUBDIR_LIB}" STREQUAL "win64")
endif("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "AMD64") # endif("$ENV{PROCESSOR_ARCHITECTURE}" STREQUAL "AMD64")
#message(STATUS "TEST ALALALALALALALAL MATLAB_ROOT has been found : ${MEX_SUBDIR_LIB} ${MEX_EXT}") #message(STATUS "TEST ALALALALALALALAL MATLAB_ROOT has been found : ${MEX_SUBDIR_LIB} ${MEX_EXT}")
# METHODE 2 (using matlab) # METHODE 2 (using matlab)
#exec_program("${PROJECT_SOURCE_DIR}/CMake/matlab_arch.bat 0 \"${MATLAB_ARCH_FILE}\"" OUTPUT_VARIABLE MEX_SUBDIR_LIB) #exec_program("${PROJECT_SOURCE_DIR}/CMake/matlab_arch.bat 0 \"${MATLAB_ARCH_FILE}\"" OUTPUT_VARIABLE MEX_SUBDIR_LIB)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment