find matlab windows

CMake/findMatlab.cmake

@@ -42,7 +42,7 @@ if(UNIX)
 
 elseif(WIN32)
 
-	exec_program("${CMAKE_SOURCE_DIR}/CMake/find_matlab_path.bat")
+	exec_program("${CMAKE_SOURCE_DIR}/CMake/find_matlab_path.bat" "${PROJECT_BINARY_DIR}")
 	FILE(READ "${PROJECT_BINARY_DIR}/logPath.txt" contents)
 	#message(STATUS "contents=${contents}")
 	#STRING(REGEX REPLACE "\n" "" contents "${contents}")
@@ -66,8 +66,12 @@ elseif(WIN32)
 	message(STATUS "If you want to choose an other version of Matlab, please add environment variable MATLAB_EXE_DIR ")
 			
 	if ($ENV{MATLAB_EXE_DIR}} MATCHES matlab)
-		#message(STATUS "MATLAB_DIR_TMP = $ENV{MATLAB_EXE_DIR_TMP}")
 		set(MATLAB_DIR_TMP $ENV{MATLAB_EXE_DIR})
+		message(STATUS "MATLAB_DIR_TMP=$ENV{MATLAB_EXE_DIR} defined from environment variable")
+	elseif (${MATLAB_EXE_DIR} MATCHES matlab)
+		#message(STATUS "MATLAB_DIR_TMP = ${MATLAB_EXE_DIR_TMP}")
+		set(MATLAB_DIR_TMP ${MATLAB_EXE_DIR})
+		message(STATUS "MATLAB_DIR_TMP=${MATLAB_EXE_DIR} defined from local input variable")
 	elseif (${MATLAB_EXE_DIR_TMP} MATCHES matlab)
 		#message(STATUS "MATLAB_DIR_TMP = ${MATLAB_EXE_DIR_TMP}")
 		set(MATLAB_DIR_TMP ${MATLAB_EXE_DIR_TMP})
@@ -82,7 +86,7 @@ elseif(WIN32)
 	#set(findMatlabRootBAT "${CMAKE_SOURCE_DIR}/CMake/find_matlab_root_V2.bat" CACHE STRING "fichier bat matlab " FORCE )
 	#exec_program(${findMatlabRootBAT})
 	#message(STATUS "MATLAB_DIR_TMP 2 = ${MATLAB_DIR_TMP}")
-	#set(MATLAB_DIR_TMP "C:\\Program Files\\MATLAB\\R2015b\\bin\\matlab.exe")
+	#set(MATLAB_DIR_TMP "F:\\programFiles\\MATLAB\\R2014b\\bin\\matlab.exe")
 	#message(STATUS "MATLAB_DIR_TMP 2222 = ${MATLAB_DIR_TMP}")	
 else()
 	message(WARNING "Unknown type of plateform for matlab")		

CMake/find_matlab_path.bat

 @echo off
 set "find_exe=matlab.exe"
 
-(where matlab.exe) >> logPath.txt 
+(where matlab.exe) > logPath.txt 
 (where /R "C:\\Program Files\\MATLAB" matlab.exe) >> logPath.txt 
 (where /R "C:\\Program Files (x86)\\MATLAB" matlab.exe) >> logPath.txt