diff --git a/CMakeLists.txt b/CMakeLists.txt index 7ccd5e9f967daf637f12965f220e26650585c018..06a76b308beb5f1f107abf303a14150423c16365 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -84,6 +84,7 @@ message (STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}") #set(FAUST_INSTALL_TESTING_DATA "${PROJECT_BINARY_DIR}/output/testing/data" CACHE STRING "default install path for the test faust" FORCE ) # default location of install dir for matlab component SET(CMAKE_INSTALL_MATLAB_PREFIX "$ENV{HOME}/Documents/MATLAB/faust" CACHE STRING "default install path for the matlab wrapper" FORCE ) + SET(CMAKE_INSTALL_PYTHON_PREFIX "$ENV{HOME}/Documents/PYTHON/faust" CACHE STRING "default install path for the matlab wrapper" FORCE ) # CMAKE_INSTALL_PREFIX path is deleted for next cmake .. configure SET(CMAKE_INSTALL_PREFIX "" CACHE STRING "default install path" FORCE ) #message (STATUS "default install") @@ -100,6 +101,7 @@ message (STATUS "CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}") #set(FAUST_INSTALL_TESTING_DATA "${CMAKE_INSTALL_PREFIX}/testing/data") # default location of install dir for matlab component SET(CMAKE_INSTALL_MATLAB_PREFIX "${CMAKE_INSTALL_PREFIX}/matlab") + SET(CMAKE_INSTALL_PYTHON_PREFIX "$${CMAKE_INSTALL_PREFIX}/python" CACHE STRING "default install path for the matlab wrapper" FORCE ) else() message(STATUS "Install FAuST path already defined to : ${CMAKE_INSTALL_MATLAB_PREFIX}") diff --git a/gen_doc/LaTeX/chapInstallUnix.tex b/gen_doc/LaTeX/chapInstallUnix.tex index 501513919981853092492969fb21810f3509f02d..a373abe51ddf5f82b01fe258e09a538f17040c8b 100755 --- a/gen_doc/LaTeX/chapInstallUnix.tex +++ b/gen_doc/LaTeX/chapInstallUnix.tex @@ -116,11 +116,16 @@ In the terminal opened in Section \ref{sec:UnixBuildDownload}, type the following commands : \lstset{style=customBash} \begin{lstlisting} -> mkdir build -> cd build -> cmake .. -> make -> sudo make install # run with administrator privilege +# create build directory +>mkdir build +# go into this directory +>cd build +# generate/configure the project (choice IDE ...) +>ccmake "Path2SrcDir" +# build the project (dependent of the IDE) +>make +# install the project (dependent of the IDE) +>sudo make install # run with administrator privilege \end{lstlisting} FA$\mu$ST Toolbox should be installed. Now, refer to Quick-Start Chapter \ref{sec:firstUse} to check the install and to try FA$\mu$ST toolbox. diff --git a/misc/test/CMakeLists.txt b/misc/test/CMakeLists.txt index e0b541e5a74d2f56a57dd8460ac51404a8338290..2fb0f9ee9715c1ca05bbe85a5d64e228277188a9 100755 --- a/misc/test/CMakeLists.txt +++ b/misc/test/CMakeLists.txt @@ -222,6 +222,7 @@ endif(BUILD_WRAPPER_MATLAB) #PYTHON WRAPPER if (BUILD_WRAPPER_PYTHON) add_test(NAME PYTHON_FAUST COMMAND ${PYTHON_EXE} ${FAUST_SRC_TEST_SRC_DIR}/test_pyFaust.py ${FAUST_PYTHON_BIN_DIR}) + add_test(NAME PYTHON_FAUST_INSTALL COMMAND ${PYTHON_EXE} ${FAUST_SRC_TEST_SRC_DIR}/test_pyFaust.py ${CMAKE_INSTALL_PYTHON_PREFIX}) if(PYTHON_MODULE_SCIPY) add_test(NAME PYTHON_FAUST_TIME COMMAND ${PYTHON_EXE} ${FAUST_SRC_TEST_SRC_DIR}/test_pyFaust_time.py ${FAUST_PYTHON_BIN_DIR} ${FAUST_BIN_TEST_FIG_DIR}) diff --git a/wrapper/python/CMakeLists.txt b/wrapper/python/CMakeLists.txt index efa0bb7ce4119c3f17f17e461fc74055c817c5a9..4b36496f201f98be692671d01cce5c33a69f03e8 100644 --- a/wrapper/python/CMakeLists.txt +++ b/wrapper/python/CMakeLists.txt @@ -58,7 +58,5 @@ add_custom_command(TARGET ${FAUST_PYTHON_TARGET} COMMENT "Creating PyFaust") -#add_custom_command(TARGET ${FAUST_PYTHON_TARGET} -# COMMAND python -# ARGS "${FAUST_PYTHON_BIN_DIR}/setup.py" "build_ext" "--build-lib" "${FAUST_PYTHON_BIN_DIR}" "--build-temp" "${FAUST_PYTHON_BIN_DIR}" -# COMMENT "Creating PyFaust") +#install the python wrapper +install(DIRECTORY ${FAUST_PYTHON_BIN_DIR}/ DESTINATION ${CMAKE_INSTALL_PYTHON_PREFIX} FILE_PERMISSIONS ${INSTALL_FILE_PERMISSION} DIRECTORY_PERMISSIONS ${INSTALL_DIR_PERMISSION} FILES_MATCHING PATTERN "*.${MEX_EXT}" PATTERN "*.py" PATTERN "*.so" PATTERN "build" EXCLUDE PATTERN "setup*" EXCLUDE PATTERN "CMakeFiles*" EXCLUDE)