Mentions légales du service

Skip to content
Snippets Groups Projects
Commit ea56cd41 authored by Nicolas Bellot's avatar Nicolas Bellot Committed by hhakim
Browse files

installation du wrapper matlab faite en une fois

parent f1ab294b
Branches
Tags
No related merge requests found
Hide whitespace changes
Inline Side-by-side
CMakeLists.txt
+ 14
− 29
View file @ ea56cd41
...@@ -331,8 +331,9 @@ if (BUILD_MATLAB_MEX_FILES) ...@@ -331,8 +331,9 @@ if (BUILD_MATLAB_MEX_FILES)
set(FAUST_MATLAB_OLD_UTILS_BIN_DIR ${FAUST_MATLAB_OLD_BIN_DIR}/utils CACHE INTERNAL "") set(FAUST_MATLAB_OLD_UTILS_BIN_DIR ${FAUST_MATLAB_OLD_BIN_DIR}/utils CACHE INTERNAL "")
#### INSTALL DIRECTORY #### #### INSTALL DIRECTORY ####
#set(FAUST_MATLAB_INSTALL_DIR ${CMAKE_INSTALL_MATLAB_PREFIX}) #set(FAUST_MATLAB_INSTALL_DIR ${CMAKE_INSTALL_MATLAB_PREFIX})
set(FAUST_MATLAB_MEX_INSTALL_DIR ${CMAKE_INSTALL_MATLAB_PREFIX}/mex)
set(FAUST_MATLAB_TOOLS_INSTALL_DIR ${CMAKE_INSTALL_MATLAB_PREFIX}/tools CACHE INTERNAL "") #set(FAUST_MATLAB_MEX_INSTALL_DIR ${CMAKE_INSTALL_MATLAB_PREFIX}/mex)
#set(FAUST_MATLAB_TOOLS_INSTALL_DIR ${CMAKE_INSTALL_MATLAB_PREFIX}/tools CACHE INTERNAL "")
########## DEMO DIRECTORIES ############# ########## DEMO DIRECTORIES #############
...@@ -359,27 +360,11 @@ if (BUILD_MATLAB_MEX_FILES) ...@@ -359,27 +360,11 @@ if (BUILD_MATLAB_MEX_FILES)
#### INSTALL DIRECTORY #### #### INSTALL DIRECTORY ####
#set(FAUST_DEMO_INSTALL_DIR ${CMAKE_INSTALL_MATLAB_PREFIX}/demo CACHE INTERNAL "") # No need to specify installation demo directory because
#set(FAUST_DEMO_BSL_INSTALL_DIR ${FAUST_DEMO_INSTALL_DIR}/Brain_source_localization CACHE INTERNAL "") # it has the same architecture as FAUST_DEMO_BIN_DIR
#set(FAUST_DEMO_TOOLS_INSTALL_DIR ${FAUST_DEMO_INSTALL_DIR}/tools CACHE INTERNAL "") # so FAUST_DEMO_BIN_DIR is directly installed
#set(FAUST_DEMO_HADAMARD_INSTALL_DIR ${FAUST_DEMO_INSTALL_DIR}/Hadamard_factorization CACHE INTERNAL "")
#set(FAUST_DEMO_BSL_DATA_INSTALL_DIR ${FAUST_DEMO_BSL_INSTALL_DIR}/data CACHE INTERNAL "")
#set(FAUST_DEMO_BSL_OUTPUT_INSTALL_DIR ${FAUST_DEMO_BSL_INSTALL_DIR}/output CACHE INTERNAL "")
#set(FAUST_DEMO_HADAMARD_OUTPUT_INSTALL_DIR ${FAUST_DEMO_HADAMARD_INSTALL_DIR}/output/ CACHE INTERNAL "")
#set(FAUST_DEMO_TIMECOMP_INSTALL_DIR ${FAUST_DEMO_INSTALL_DIR}/Runtime_comparison CACHE INTERNAL "")
#set(FAUST_DEMO_FIG_INSTALL_DIR ${FAUST_DEMO_INSTALL_DIR}/Figures CACHE INTERNAL "")
#set(FAUST_DEMO_QUICKSTART_INSTALL_DIR ${FAUST_DEMO_INSTALL_DIR}/Quick_start CACHE INTERNAL "")
#file(MAKE_DIRECTORY ${FAUST_DEMO_INSTALL_DIR})
#file(MAKE_DIRECTORY ${FAUST_DEMO_BSL_INSTALL_DIR})
#file(MAKE_DIRECTORY ${FAUST_DEMO_TOOLS_INSTALL_DIR})
#file(MAKE_DIRECTORY ${FAUST_DEMO_HADAMARD_INSTALL_DIR})
#file(MAKE_DIRECTORY ${FAUST_DEMO_BSL_DATA_INSTALL_DIR})
#file(MAKE_DIRECTORY ${FAUST_DEMO_BSL_OUTPUT_INSTALL_DIR})
#file(MAKE_DIRECTORY ${FAUST_DEMO_HADAMARD_OUTPUT_INSTALL_DIR})
#file(MAKE_DIRECTORY ${FAUST_DEMO_TIMECOMP_INSTALL_DIR})
#file(MAKE_DIRECTORY ${FAUST_DEMO_FIG_INSTALL_DIR})
#file(MAKE_DIRECTORY ${FAUST_DEMO_QUICKSTART_INSTALL_DIR})
endif(BUILD_MATLAB_MEX_FILES) endif(BUILD_MATLAB_MEX_FILES)
################################################################## ##################################################################
...@@ -421,14 +406,14 @@ file(MAKE_DIRECTORY ${FAUST_BIN_TEST_TMP_DIR}) ...@@ -421,14 +406,14 @@ file(MAKE_DIRECTORY ${FAUST_BIN_TEST_TMP_DIR})
# [FILE_PERMISSIONS permissions...] # [FILE_PERMISSIONS permissions...]
# [DIRECTORY_PERMISSIONS permissions...] # [DIRECTORY_PERMISSIONS permissions...]
set(INSTALL_DIR_PERMISSION OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
set(INSTALL_FILE_PERMISSION OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
if (BUILD_MATLAB_MEX_FILES) if (BUILD_MATLAB_MEX_FILES)
#file(MAKE_DIRECTORY ${FAUST_DEMO_BSL_OUTPUT_BIN_DIR}) file(MAKE_DIRECTORY ${FAUST_DEMO_BSL_OUTPUT_BIN_DIR})
#install(DIRECTORY ${FAUST_DEMO_BSL_OUTPUT_BIN_DIR} DESTINATION ${FAUST_DEMO_BSL_OUTPUT_INSTALL_DIR} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE ) file(MAKE_DIRECTORY ${FAUST_DEMO_HADAMARD_OUTPUT_BIN_DIR})
#file(MAKE_DIRECTORY ${FAUST_DEMO_HADAMARD_OUTPUT_BIN_DIR}) file(MAKE_DIRECTORY ${FAUST_DEMO_FIG_BIN_DIR})
#install(DIRECTORY ${FAUST_DEMO_HADAMARD_OUTPUT_BIN_DIR} DESTINATION ${FAUST_DEMO_HADAMARD_OUTPUT_INSTALL_DIR} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE )
#file(MAKE_DIRECTORY ${FAUST_DEMO_FIG_BIN_DIR})
#install(DIRECTORY ${FAUST_DEMO_FIG_BIN_DIR} DESTINATION ${FAUST_DEMO_INSTALL_DIR} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE )
endif (BUILD_MATLAB_MEX_FILES) endif (BUILD_MATLAB_MEX_FILES)
......
misc/demo/CMakeLists.txt
+ 3
− 1
View file @ ea56cd41
...@@ -53,8 +53,10 @@ if(BUILD_MATLAB_MEX_FILES) ...@@ -53,8 +53,10 @@ if(BUILD_MATLAB_MEX_FILES)
configure_file(${FAUST_DEMO_TOOLS_SRC_DIR}/${tools} ${FAUST_DEMO_TOOLS_BIN_DIR}/${tools} COPYONLY) configure_file(${FAUST_DEMO_TOOLS_SRC_DIR}/${tools} ${FAUST_DEMO_TOOLS_BIN_DIR}/${tools} COPYONLY)
endforeach() endforeach()
install(DIRECTORY ${FAUST_DEMO_BIN_DIR} DESTINATION ${CMAKE_INSTALL_MATLAB_PREFIX} FILE_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE DIRECTORY_PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE FILES_MATCHING PATTERN "*.m" PATTERN "*.mat" PATTERN "*CMakeFiles*" EXCLUDE)
#the installation is made in wrapper/matlab/CmakeList.txt as the demo is now Matlab code
endif() endif()
......
wrapper/matlab/CMakeLists.txt
+ 13
− 11
View file @ ea56cd41
...@@ -10,12 +10,12 @@ ...@@ -10,12 +10,12 @@
# matlab tools directory # matlab tools directory
foreach(MATLAB_TOOLS FaustCore faust_decompose generate_params) foreach(MATLAB_TOOLS FaustCore faust_decompose generate_params)
configure_file(${FAUST_MATLAB_TOOLS_SRC_DIR}/${MATLAB_TOOLS}.m ${FAUST_MATLAB_TOOLS_BIN_DIR}/${MATLAB_TOOLS}.m COPYONLY) configure_file(${FAUST_MATLAB_TOOLS_SRC_DIR}/${MATLAB_TOOLS}.m ${FAUST_MATLAB_TOOLS_BIN_DIR}/${MATLAB_TOOLS}.m COPYONLY)
install(FILES ${FAUST_MATLAB_TOOLS_BIN_DIR}/${MATLAB_TOOLS}.m DESTINATION ${FAUST_MATLAB_TOOLS_INSTALL_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE) #install(FILES ${FAUST_MATLAB_TOOLS_BIN_DIR}/${MATLAB_TOOLS}.m DESTINATION ${FAUST_MATLAB_TOOLS_INSTALL_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
endforeach() endforeach()
# install Faust.m in the CMAKE_INSTALL_MATLAB_PREFIX directory # install Faust.m in the CMAKE_INSTALL_MATLAB_PREFIX directory
configure_file(${FAUST_MATLAB_SRC_DIR}/Faust.m ${FAUST_MATLAB_BIN_DIR}/Faust.m COPYONLY) configure_file(${FAUST_MATLAB_SRC_DIR}/Faust.m ${FAUST_MATLAB_BIN_DIR}/Faust.m COPYONLY)
install(FILES ${FAUST_MATLAB_BIN_DIR}/Faust.m DESTINATION ${CMAKE_INSTALL_MATLAB_PREFIX} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE) #install(FILES ${FAUST_MATLAB_BIN_DIR}/Faust.m DESTINATION ${CMAKE_INSTALL_MATLAB_PREFIX} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
...@@ -146,15 +146,15 @@ foreach(mex_target ${MEXFILE_TARGET_LIST}) ...@@ -146,15 +146,15 @@ foreach(mex_target ${MEXFILE_TARGET_LIST})
message(FATAL_ERROR "Unable to compile mex functions for this platform") message(FATAL_ERROR "Unable to compile mex functions for this platform")
endif() endif()
configure_file(${FAUST_MATLAB_DOC_SRC_DIR}/${mex_target}.m ${FAUST_MATLAB_MEX_BIN_DIR}/${mex_target}.m COPYONLY) configure_file(${FAUST_MATLAB_DOC_SRC_DIR}/${mex_target}.m ${FAUST_MATLAB_MEX_BIN_DIR}/${mex_target}.m COPYONLY)
install(FILES ${FAUST_MATLAB_MEX_BIN_DIR}/${mex_target}.m DESTINATION ${FAUST_MATLAB_MEX_INSTALL_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE) #install(FILES ${FAUST_MATLAB_MEX_BIN_DIR}/${mex_target}.m DESTINATION ${FAUST_MATLAB_MEX_INSTALL_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
install(FILES ${FAUST_MATLAB_MEX_BIN_DIR}/${mex_target}.${MEX_EXT} DESTINATION ${FAUST_MATLAB_MEX_INSTALL_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE) #install(FILES ${FAUST_MATLAB_MEX_BIN_DIR}/${mex_target}.${MEX_EXT} DESTINATION ${FAUST_MATLAB_MEX_INSTALL_DIR} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE)
endforeach() endforeach()
# CONFIGURATION DES CHEMINS # CONFIGURATION DES CHEMINS
configure_file(${FAUST_MATLAB_SRC_DIR}/setup_FAUST.m.in ${FAUST_MATLAB_BIN_DIR}/setup_FAUST.m @ONLY) configure_file(${FAUST_MATLAB_SRC_DIR}/setup_FAUST.m.in ${FAUST_MATLAB_BIN_DIR}/setup_FAUST.m @ONLY)
install(FILES ${FAUST_MATLAB_BIN_DIR}/setup_FAUST.m DESTINATION ${CMAKE_INSTALL_MATLAB_PREFIX} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE ) #install(FILES ${FAUST_MATLAB_BIN_DIR}/setup_FAUST.m DESTINATION ${CMAKE_INSTALL_MATLAB_PREFIX} PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_WRITE GROUP_EXECUTE WORLD_READ WORLD_WRITE WORLD_EXECUTE )
### OLD MATLAB VERSION CODE TO MAKE TIME COMPARISON ######## ### OLD MATLAB VERSION CODE TO MAKE TIME COMPARISON ########
...@@ -179,8 +179,7 @@ foreach(mex_target ${MEXFILE_TARGET_LIST}) ...@@ -179,8 +179,7 @@ foreach(mex_target ${MEXFILE_TARGET_LIST})
file(GLOB MATLAB_PROX RELATIVE ${FAUST_MATLAB_OLD_PROX_SRC_DIR} "${FAUST_MATLAB_OLD_PROX_SRC_DIR}/*.m") file(GLOB MATLAB_PROX RELATIVE ${FAUST_MATLAB_OLD_PROX_SRC_DIR} "${FAUST_MATLAB_OLD_PROX_SRC_DIR}/*.m")
#message(STATUS "MATLAB PROX : ${MATLAB_PROX}") #message(STATUS "MATLAB PROX : ${MATLAB_PROX}")
foreach(prox ${MATLAB_PROX}) foreach(prox ${MATLAB_PROX})
configure_file(${FAUST_MATLAB_OLD_PROX_SRC_DIR}/${prox} ${FAUST_MATLAB_OLD_PROX_BIN_DIR}/${prox} COPYONLY) configure_file(${FAUST_MATLAB_OLD_PROX_SRC_DIR}/${prox} ${FAUST_MATLAB_OLD_PROX_BIN_DIR}/${prox} COPYONLY)
#install(FILES ${FAUST_MATLAB_MEX_SRC_DIR}/proxs/${prox} DESTINATION ${FAUST_MATLAB_MEX_INSTALL_DIR})
endforeach() endforeach()
...@@ -188,20 +187,23 @@ foreach(mex_target ${MEXFILE_TARGET_LIST}) ...@@ -188,20 +187,23 @@ foreach(mex_target ${MEXFILE_TARGET_LIST})
file(GLOB MATLAB_PROX RELATIVE ${FAUST_MATLAB_OLD_PROX_SRC_DIR} "${FAUST_MATLAB_OLD_PROX_SRC_DIR}/*.m") file(GLOB MATLAB_PROX RELATIVE ${FAUST_MATLAB_OLD_PROX_SRC_DIR} "${FAUST_MATLAB_OLD_PROX_SRC_DIR}/*.m")
#message(STATUS "MATLAB PROX : ${MATLAB_PROX}") #message(STATUS "MATLAB PROX : ${MATLAB_PROX}")
foreach(prox ${MATLAB_PROX}) foreach(prox ${MATLAB_PROX})
configure_file(${FAUST_MATLAB_OLD_PROX_SRC_DIR}/${prox} ${FAUST_MATLAB_OLD_PROX_BIN_DIR}/${prox} COPYONLY) configure_file(${FAUST_MATLAB_OLD_PROX_SRC_DIR}/${prox} ${FAUST_MATLAB_OLD_PROX_BIN_DIR}/${prox} COPYONLY)
#install(FILES ${FAUST_MATLAB_MEX_SRC_DIR}/proxs/${prox} DESTINATION ${FAUST_MATLAB_MEX_INSTALL_DIR})
endforeach() endforeach()
file(GLOB MATLAB_UTILS RELATIVE ${FAUST_MATLAB_OLD_UTILS_SRC_DIR} "${FAUST_MATLAB_OLD_UTILS_SRC_DIR}/*.m") file(GLOB MATLAB_UTILS RELATIVE ${FAUST_MATLAB_OLD_UTILS_SRC_DIR} "${FAUST_MATLAB_OLD_UTILS_SRC_DIR}/*.m")
#message(STATUS "MATLAB PROX : ${MATLAB_PROX}") #message(STATUS "MATLAB PROX : ${MATLAB_PROX}")
foreach(prox ${MATLAB_UTILS}) foreach(prox ${MATLAB_UTILS})
configure_file(${FAUST_MATLAB_OLD_UTILS_SRC_DIR}/${prox} ${FAUST_MATLAB_OLD_UTILS_BIN_DIR}/${prox} COPYONLY) configure_file(${FAUST_MATLAB_OLD_UTILS_SRC_DIR}/${prox} ${FAUST_MATLAB_OLD_UTILS_BIN_DIR}/${prox} COPYONLY)
#install(FILES ${FAUST_MATLAB_MEX_SRC_DIR}/proxs/${prox} DESTINATION ${FAUST_MATLAB_MEX_INSTALL_DIR})
endforeach() endforeach()
#### installation ####
install(DIRECTORY ${FAUST_MATLAB_BIN_DIR}/ DESTINATION ${CMAKE_INSTALL_MATLAB_PREFIX} FILE_PERMISSIONS ${INSTALL_FILE_PERMISSION} DIRECTORY_PERMISSIONS ${INSTALL_DIR_PERMISSION} FILES_MATCHING PATTERN "*.${MEX_EXT}" PATTERN "*.m" PATTERN "*.mat" PATTERN "*CMakeFiles*" EXCLUDE PATTERN "*old_matlab*" EXCLUDE)
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment