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
6a026052
Commit
6a026052
authored
8 years ago
by
Adrien Leman
Committed by
hhakim
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
debug findmatlab
parent
af622671
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
CMake/findMatlab.cmake
+8
-10
8 additions, 10 deletions
CMake/findMatlab.cmake
src/algorithm/CMakeLists.txt
+2
-2
2 additions, 2 deletions
src/algorithm/CMakeLists.txt
with
10 additions
and
12 deletions
CMake/findMatlab.cmake
+
8
−
10
View file @
6a026052
...
...
@@ -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_TMP
3
${
MATLAB_DIR_TMP
}
"
)
message
(
STATUS
"MATLAB_ROOT TMP
3:
${
MATLAB_ROOT
}
"
)
message
(
STATUS
"MATLAB_DIR_TMP
=
${
MATLAB_DIR_TMP
}
"
)
message
(
STATUS
"MATLAB_ROOT TMP
=
${
MATLAB_ROOT
}
"
)
endif
()
elseif
(
WIN32
)
...
...
This diff is collapsed.
Click to expand it.
src/algorithm/CMakeLists.txt
+
2
−
2
View file @
6a026052
...
...
@@ -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
()
...
...
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