Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
faust
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
GitLab upgrade completed. Current version is 17.11.4.
Show more breadcrumbs
faust group
faust
Commits
b4f927f0
Commit
b4f927f0
authored
9 years ago
by
Nicolas Bellot
Committed by
hhakim
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
CMakelists supression variable LINUX non stable
parent
c7514818
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CMakeLists.txt
+35
-19
35 additions, 19 deletions
CMakeLists.txt
wrapper/matlab/CMakeLists.txt
+20
-17
20 additions, 17 deletions
wrapper/matlab/CMakeLists.txt
with
55 additions
and
36 deletions
CMakeLists.txt
+
35
−
19
View file @
b4f927f0
...
@@ -28,6 +28,17 @@ set(FAUST_VERSION_MINOR 0)
...
@@ -28,6 +28,17 @@ set(FAUST_VERSION_MINOR 0)
if
(
CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
)
if
(
CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
)
SET
(
CMAKE_INSTALL_PREFIX
"
${
CMAKE_SOURCE_DIR
}
/build/FAuST_OUTPUT"
CACHE STRING
"default install path"
FORCE
)
SET
(
CMAKE_INSTALL_PREFIX
"
${
CMAKE_SOURCE_DIR
}
/build/FAuST_OUTPUT"
CACHE STRING
"default install path"
FORCE
)
endif
(
CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
)
endif
(
CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT
)
if
(
UNIX
)
message
(
status
"UNIX OPERATING SYSTEM"
)
#if(LINUX) DON'T WORK SO AN UNIX OS WHICH IS NOT APPLE IS ASSUMED TO BE LINUX OS
if
(
APPLE
)
message
(
status
"APPLE OPERATING SYSTEM"
)
else
(
APPLE
)
message
(
status
"LINUX OPERATING SYSTEM"
)
endif
(
APPLE
)
message
(
status
"CMAKE_SYSTEM
${
CMAKE_SYSTEM
}
"
)
endif
()
###### tmp directory where temporary objects will be located ######
###### tmp directory where temporary objects will be located ######
set
(
FAUST_TMP_BUILD_DIR
"
${
PROJECT_BINARY_DIR
}
/tmp"
)
set
(
FAUST_TMP_BUILD_DIR
"
${
PROJECT_BINARY_DIR
}
/tmp"
)
...
@@ -413,21 +424,24 @@ if( ${MATLAB_DIR_TMP} MATCHES "matlab")
...
@@ -413,21 +424,24 @@ if( ${MATLAB_DIR_TMP} MATCHES "matlab")
set
(
MATLAB_INCLUDE_DIR
"
${
MATLAB_ROOT
}
/extern/include"
CACHE INTERNAL
"Matlab include directory"
)
set
(
MATLAB_INCLUDE_DIR
"
${
MATLAB_ROOT
}
/extern/include"
CACHE INTERNAL
"Matlab include directory"
)
set
(
MATLAB_ARCH_FILE
"
${
FAUST_TMP_BUILD_DIR
}
/matlab_arch.txt"
)
set
(
MATLAB_ARCH_FILE
"
${
FAUST_TMP_BUILD_DIR
}
/matlab_arch.txt"
)
# LINUX AND APPLE METHOD ARE VERY SIMILAR, CODE COULD BE FACTORIZED
# LINUX AND APPLE METHOD ARE VERY SIMILAR, CODE COULD BE FACTORIZED
if
(
LINUX
)
if
(
UNIX
)
if
(
APPLE
)
exec_program
(
"ls
${
MATLAB_ROOT
}
/extern/lib | grep -i mac"
OUTPUT_VARIABLE MEX_SUBDIR_LIB
)
if
(
"
${
MEX_SUBDIR_LIB
}
"
STREQUAL
"maci64"
)
set
(
MEX_EXT
"mexmaci64"
)
elseif
(
"
${
MEX_SUBDIR_LIB
}
"
STREQUAL
"maci"
)
set
(
MEX_EXT
"mexmaci"
)
endif
()
# METHODE 1 (without using matlab)
# METHODE 1 (without using matlab)
exec_program
(
"ls
${
MATLAB_ROOT
}
/extern/lib | grep -i glnx"
OUTPUT_VARIABLE MEX_SUBDIR_LIB
)
else
(
APPLE
)
if
(
"
${
MEX_SUBDIR_LIB
}
"
STREQUAL
"glnxa64"
)
exec_program
(
"ls
${
MATLAB_ROOT
}
/extern/lib | grep -i glnx"
OUTPUT_VARIABLE MEX_SUBDIR_LIB
)
set
(
MEX_EXT
"mexa64"
)
if
(
"
${
MEX_SUBDIR_LIB
}
"
STREQUAL
"glnxa64"
)
elseif
(
"
${
MEX_SUBDIR_LIB
}
"
STREQUAL
"glnx86"
)
set
(
MEX_EXT
"mexa64"
)
set
(
MEX_EXT
"mexa32"
)
elseif
(
"
${
MEX_SUBDIR_LIB
}
"
STREQUAL
"glnx86"
)
endif
()
set
(
MEX_EXT
"mexa32"
)
elseif
(
APPLE
)
endif
()
exec_program
(
"ls
${
MATLAB_ROOT
}
/extern/lib | grep -i mac"
OUTPUT_VARIABLE MEX_SUBDIR_LIB
)
endif
(
APPLE
)
if
(
"
${
MEX_SUBDIR_LIB
}
"
STREQUAL
"maci64"
)
set
(
MEX_EXT
"mexmaci64"
)
elseif
(
"
${
MEX_SUBDIR_LIB
}
"
STREQUAL
"maci"
)
set
(
MEX_EXT
"mexmaci"
)
endif
()
# METHODE 2 (using matlab)
# METHODE 2 (using matlab)
#exec_program("matlab -wait -nodesktop -nojvm -nodisplay -r \"fid=fopen('${MATLAB_ARCH_FILE}','w');fprintf(fid,'%s\\n%s\\n',computer('arch'),mexext);fclose(fid);exit\" > ${FAUST_TMP_BUILD_DIR}/matlab_output.log")
#exec_program("matlab -wait -nodesktop -nojvm -nodisplay -r \"fid=fopen('${MATLAB_ARCH_FILE}','w');fprintf(fid,'%s\\n%s\\n',computer('arch'),mexext);fclose(fid);exit\" > ${FAUST_TMP_BUILD_DIR}/matlab_output.log")
...
@@ -499,11 +513,13 @@ endif (FAUST_USE_GPU)
...
@@ -499,11 +513,13 @@ endif (FAUST_USE_GPU)
if
(
FAUST_USE_MEX
)
if
(
FAUST_USE_MEX
)
if
(
LINUX
)
if
(
UNIX
)
#target_link_libraries(${FAUST_TARGET} ${MATLAB_ROOT}/bin/glnxa64/libmex.so)
if
(
APPLE
)
target_link_libraries
(
${
FAUST_TARGET
}
${
MATLAB_ROOT]/bin/
${
MEX_SUBDIR_LIB
}
/libmex.so)
target_link_libraries
(
${
FAUST_TARGET
}
${
MATLAB_ROOT
}
/bin/
${
MEX_SUBDIR_LIB
}
/libmex.dylib
)
elseif(APPLE)
else
(
APPLE
)
target_link_libraries(
${
FAUST_TARGET
}
${
MATLAB_ROOT
}
/bin/
${
MEX_SUBDIR_LIB
}
/libmex.dylib)
target_link_libraries
(
${
FAUST_TARGET
}
${
MATLAB_ROOT
}
/bin/
${
MEX_SUBDIR_LIB
}
/libmex.so
)
endif
(
APPLE
)
elseif
(
WIN32
)
elseif
(
WIN32
)
message
(
FATAL_ERROR
"MEXFILE : CANNOT SEARCH LIBMEX IN WINDOWS"
)
message
(
FATAL_ERROR
"MEXFILE : CANNOT SEARCH LIBMEX IN WINDOWS"
)
endif
()
endif
()
...
...
This diff is collapsed.
Click to expand it.
wrapper/matlab/CMakeLists.txt
+
20
−
17
View file @
b4f927f0
...
@@ -68,24 +68,27 @@ foreach(mex_target ${MEXFILE_TARGET_LIST})
...
@@ -68,24 +68,27 @@ foreach(mex_target ${MEXFILE_TARGET_LIST})
add_custom_target
(
${
mex_target
}
DEPENDS
${
FAUST_MEXINTERFACEMEX_SRC_DIR
}
/
${
mex_target
}
.cpp
${
mex_target
}
.
${
MEX_EXT
}
${
FAUST_MEXTOOLS_TARGET
}
${
FAUST_TARGET
}
)
add_custom_target
(
${
mex_target
}
DEPENDS
${
FAUST_MEXINTERFACEMEX_SRC_DIR
}
/
${
mex_target
}
.cpp
${
mex_target
}
.
${
MEX_EXT
}
${
FAUST_MEXTOOLS_TARGET
}
${
FAUST_TARGET
}
)
endif
()
endif
()
if
(
LINU
X
)
if
(
UNI
X
)
#add_custom_command(OUTPUT ${mex_target}.${MEX_EXT}
#COMMAND ${MATLAB_ROOT}/bin/mex
if
(
APPLE
)
#ARGS "-v" "-largeArrayDims" "${FAUST_MEXINTERFACEMEX_SRC_DIR}/${mex_target}.cpp"
add_custom_command
(
OUTPUT
${
mex_target
}
.
${
MEX_EXT
}
#"LDFLAGS=$$LDFLAGS -Wl,-rpath=${MATLAB_ROOT}/bin/${MEX_SUBDIR_LIB}:${FAUST_INSTALL_LIB}:${PROJECT_BINARY_DIR}"
COMMAND
${
MATLAB_ROOT
}
/bin/mex
#"-O"
ARGS
"-v"
"-largeArrayDims"
"
${
FAUST_MEXINTERFACEMEX_SRC_DIR
}
/
${
mex_target
}
.cpp"
#${CMAKE_CXX_FLAGS_LIST}
"-O"
#${LDD_MEX_FLAGS}
${
CMAKE_CXX_FLAGS_LIST
}
#COMMENT "Creating mex function ${mex_target}.${MEX_EXT}")
${
LDD_MEX_FLAGS
}
elseif
(
APPLE
)
COMMENT
"Creating mex function
${
mex_target
}
.
${
MEX_EXT
}
"
)
add_custom_command
(
OUTPUT
${
mex_target
}
.
${
MEX_EXT
}
else
(
APPLE
)
COMMAND
${
MATLAB_ROOT
}
/bin/mex
add_custom_command
(
OUTPUT
${
mex_target
}
.
${
MEX_EXT
}
ARGS
"-v"
"-largeArrayDims"
"
${
FAUST_MEXINTERFACEMEX_SRC_DIR
}
/
${
mex_target
}
.cpp"
COMMAND
${
MATLAB_ROOT
}
/bin/mex
"-O"
ARGS
"-v"
"-largeArrayDims"
"
${
FAUST_MEXINTERFACEMEX_SRC_DIR
}
/
${
mex_target
}
.cpp"
${
CMAKE_CXX_FLAGS_LIST
}
"LDFLAGS=$$LDFLAGS -Wl,-rpath=
${
MATLAB_ROOT
}
/bin/
${
MEX_SUBDIR_LIB
}
:
${
FAUST_INSTALL_LIB
}
:
${
PROJECT_BINARY_DIR
}
"
${
LDD_MEX_FLAGS
}
"-O"
COMMENT
"Creating mex function
${
mex_target
}
.
${
MEX_EXT
}
"
)
${
CMAKE_CXX_FLAGS_LIST
}
${
LDD_MEX_FLAGS
}
COMMENT
"Creating mex function
${
mex_target
}
.
${
MEX_EXT
}
"
)
endif
(
APPLE
)
elseif
(
WIN32
)
elseif
(
WIN32
)
add_custom_command
(
OUTPUT
${
mex_target
}
.
${
MEX_EXT
}
add_custom_command
(
OUTPUT
${
mex_target
}
.
${
MEX_EXT
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment