Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 6a026052 authored by Adrien Leman's avatar Adrien Leman Committed by hhakim
Browse files

debug findmatlab

parent af622671
Branches
Tags
No related merge requests found
......@@ -68,24 +68,22 @@ elseif(WIN32)
#message(STATUS "contents2tmp=${contents2tmp}")
#message(STATUS "contents2=${contents2}")
set(MATLAB_EXE_DIR_TMP "${contents1}")
set(MATLAB_EXE_DIR_FILE_PATH "${contents1}")
#set(MATLAB_EXE_DIR_TMP2 "${contents2}")
message(STATUS "MATLAB_EXE_DIR=${MATLAB_EXE_DIR_TMP}")
#message(STATUS "MATLAB_EXE_DIR=${MATLAB_EXE_DIR_TMP}")
#message(STATUS "MATLAB_EXE_DIR_TMP2=${MATLAB_EXE_DIR_TMP2}")
if ($ENV{MATLAB_EXE_DIR}} MATCHES matlab)
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})
elseif (${MATLAB_EXE_DIR_FILE_PATH} MATCHES matlab)
set(MATLAB_DIR_TMP ${MATLAB_EXE_DIR_FILE_PATH})
else()
message(STATUS "MATLAB_DIR_TMP = $ENV{MATLAB_EXE_DIR}")
message(STATUS "MATLAB_DIR_TMP is not available. It corresponds to the path of matlab.exe }")
#message(STATUS "MATLAB_DIR_TMP = $ENV{MATLAB_EXE_DIR}")
message(STATUS "MATLAB_EXE_DIR is not available. It corresponds to the path of matlab.exe }")
message(FATAL_ERROR "Unknown path of matlab.exe. Please add environment variable MATLAB_EXE_DIR ")
endif()
......@@ -106,8 +104,8 @@ if( ${MATLAB_DIR_TMP} MATCHES "matlab")
#message(STATUS "MATLAB_ROOT TMP2: ${MATLAB_ROOT}")
if( ${MATLAB_ROOT} MATCHES "matlab") # Dans ce cas, le remplacment ne s'est pas fait.. on essaie avec la double separation "//"
string(REGEX REPLACE "([a-zA-Z0-9_/:.]+)/bin//matlab" "\\1" MATLAB_ROOT "${MATLAB_DIR_TMP}") # ds le cas ou on a /bin// matlab
message(STATUS "MATLAB_DIR_TMP3 ${MATLAB_DIR_TMP}")
message(STATUS "MATLAB_ROOT TMP3: ${MATLAB_ROOT}")
message(STATUS "MATLAB_DIR_TMP=${MATLAB_DIR_TMP}")
message(STATUS "MATLAB_ROOT TMP=${MATLAB_ROOT}")
endif()
elseif(WIN32)
......
......@@ -4,7 +4,7 @@ set(SRC_FILES "")
file(GLOB CPP_FILES "${FAUST_ALGORITHM_CONSTRAINT_SRC_DIR}/*.cpp" "${FAUST_ALGORITHM_FACTORIZATION_SRC_DIR}/*.cpp")
message(STATUS "algorithm cpp files ${CPP_FILES}")
#message(STATUS "algorithm cpp files ${CPP_FILES}")
#${FAUST_EXCEPTION_SRC_DIR}
include_directories(${FAUST_SRC_LINEAR_OPERATOR_DIR} ${FAUST_LINEAR_OPERATOR_CPU_SRC_DIR} ${EIGEN_INC_DIR})
......@@ -29,7 +29,7 @@ if (BUILD_USE_GPU)
# elseif(WIN32 AND FAUST_USE_MKL)
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /openmp")
# endif()
message(STATUS "CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}")
#message(STATUS "CMAKE_CXX_FLAGS=${CMAKE_CXX_FLAGS}")
#add_definitions(-D__COMPILE_GPU__ -D__COMPILE_SPMAT__)
add_library(${FAUST_ALGORITHM_CU_TARGET} OBJECT ${CPP_FILES})
endif()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment