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
712ea8ad
Commit
712ea8ad
authored
9 years ago
by
Adrien Leman
Committed by
hhakim
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
nex name option BUILD
parent
88d7d641
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMake/findXML2Lib.cmake
+4
-4
4 additions, 4 deletions
CMake/findXML2Lib.cmake
wrapper/cmd_line/CMakeLists.txt
+3
-3
3 additions, 3 deletions
wrapper/cmd_line/CMakeLists.txt
wrapper/matlab/CMakeLists.txt
+4
-4
4 additions, 4 deletions
wrapper/matlab/CMakeLists.txt
with
11 additions
and
11 deletions
CMake/findXML2Lib.cmake
+
4
−
4
View file @
712ea8ad
...
...
@@ -25,11 +25,11 @@ else ( (XML2_LIB_FILE) AND (XML_INC_DIR) )
#exec_program("cd ${CMAKE_SOURCE_DIR}/externals/unix/libxml2 && make install PREFIX='${CMAKE_SOURCE_DIR}/externals/unix/libxml2' ")
# NOTE WARNING : WE DON'T run make install because it is not a root user install. We used directly the lib and include in sdk_matio package.
# NOTE libxml2 install : brew install libxml2 / apt_get / dnf /...
#
add_include_path(INCLUDE_PATH_LIST_TMP_XML2 "${PROJECT_SOURCE_DIR}/externals/unix/libxml2/include")
#
add_library_path(LIBRARY_PATH_LIST_TMP_XML2 "${PROJECT_SOURCE_DIR}/externals/unix/libxml2/.libs")
add_include_path
(
INCLUDE_PATH_LIST_TMP_XML2
"
${
PROJECT_SOURCE_DIR
}
/externals/unix/libxml2/include"
)
add_library_path
(
LIBRARY_PATH_LIST_TMP_XML2
"
${
PROJECT_SOURCE_DIR
}
/externals/unix/libxml2/.libs"
)
add_include_path
(
INCLUDE_PATH_LIST_TMP_XML2
"/usr/local"
)
add_library_path
(
LIBRARY_PATH_LIST_TMP_XML2
"/usr/local"
)
#
add_include_path(INCLUDE_PATH_LIST_TMP_XML2 "/usr/local")
#
add_library_path(LIBRARY_PATH_LIST_TMP_XML2 "/usr/local")
elseif
(
WIN32
)
#exec_program("wget -P ${CMAKE_SOURCE_DIR}/externals/win http://github.com/xianyi/OpenBLAS/archive/v0.2.18.tar.gz")
...
...
This diff is collapsed.
Click to expand it.
wrapper/cmd_line/CMakeLists.txt
+
3
−
3
View file @
712ea8ad
...
...
@@ -4,14 +4,14 @@ include_directories( ${FAUST_SRC_LINEAR_OPERATOR_DIR} ${FAUST_LINEAR_OPERATOR_CP
#compatibilite ubuntu avec openblas
if
(
FAUST_USE
_OPENBLAS
)
if
(
BUILD
_OPENBLAS
)
include_directories
(
${
OPENBLAS_INC_DIR
}
)
endif
(
FAUST_USE
_OPENBLAS
)
endif
(
BUILD
_OPENBLAS
)
foreach
(
algofile launch_hierarchical_fact launch_palm4MSA
)
configure_file
(
${
FAUST_CMDLINE_FUNC_SRC_DIR
}
/
${
algofile
}
.cpp
${
FAUST_BIN_CMDLINE_SRC_DIR
}
/
${
algofile
}
.cpp COPYONLY
)
add_executable
(
${
algofile
}
${
FAUST_BIN_CMDLINE_SRC_DIR
}
/
${
algofile
}
.cpp
${
FAUST_CMDLINE_TYPE_FORMAT_XML_SRC_DIR
}
/xml_utils.cpp
)
if
(
FAUST_USE
_OPENBLAS
)
if
(
BUILD
_OPENBLAS
)
target_link_libraries
(
${
algofile
}
${
FAUST_TARGET
}
${
OPENBLAS_LIB_FILE
}
${
XML2_LIB_FILE
}
)
else
()
target_link_libraries
(
${
algofile
}
${
FAUST_TARGET
}
${
XML2_LIB_FILE
}
)
...
...
This diff is collapsed.
Click to expand it.
wrapper/matlab/CMakeLists.txt
+
4
−
4
View file @
712ea8ad
...
...
@@ -12,9 +12,9 @@ file(GLOB CPP_MEXTOOLS_FILES "${FAUST_MATLAB_TOOLS_SRC_DIR}/*.cpp")
#{${FAUST_EXCEPTION_SRC_DIR}
include_directories
(
${
FAUST_SRC_LINEAR_OPERATOR_DIR
}
${
FAUST_LINEAR_OPERATOR_CPU_SRC_DIR
}
${
FAUST_ALGORITHM_CONSTRAINT_SRC_DIR
}
${
FAUST_ALGORITHM_FACTORIZATION_SRC_DIR
}
${
FAUST_MATLAB_TOOLS_SRC_DIR
}
${
MATLAB_INCLUDE_DIR
}
${
EIGEN_INC_DIR
}
)
#modif compatibilite ubuntu avec openblas
if
(
FAUST_USE
_OPENBLAS
)
if
(
BUILD
_OPENBLAS
)
include_directories
(
${
OPENBLAS_INC_DIR
}
)
endif
(
FAUST_USE
_OPENBLAS
)
endif
(
BUILD
_OPENBLAS
)
add_library
(
${
FAUST_MEXTOOLS_TARGET
}
OBJECT
${
CPP_MEXTOOLS_FILES
}
)
#target_link_libraries(${FAUST_MEXTOOLS_TARGET} ${FAUST_TARGET})
...
...
@@ -33,14 +33,14 @@ endif()
#"-I${FAUST_FAUSTCORE_SRC_DIR}" "-I${FAUST_EXCEPTION_SRC_DIR}"
set
(
CMAKE_CXX_FLAGS_LIST
${
CMAKE_CXX_FLAGS_LIST
}
"-I
${
MATLAB_INCLUDE_DIR
}
"
"-I
${
EIGEN_INC_DIR
}
"
"-I
${
FAUST_SRC_LINEAR_OPERATOR_DIR
}
"
"-I
${
FAUST_LINEAR_OPERATOR_CPU_SRC_DIR
}
"
"-I
${
FAUST_ALGORITHM_CONSTRAINT_SRC_DIR
}
"
"-I
${
FAUST_ALGORITHM_FACTORIZATION_SRC_DIR
}
"
"-I
${
FAUST_MATLAB_TOOLS_SRC_DIR
}
"
)
if
(
FAUST_USE
_OPENBLAS AND UNIX
)
if
(
BUILD
_OPENBLAS AND UNIX
)
set
(
CMAKE_CXX_FLAGS_LIST
"
${
CMAKE_CXX_FLAGS_LIST
}
"
"-I
${
OPENBLAS_INC_DIR
}
"
)
endif
()
#target_link_libraries(${FAUST_FAUSTCORE_TARGET} ${FAUST_MATRIX_TARGET} ${FAUST_EXCEPTION_TARGET} )
if
(
UNIX
)
set
(
LDD_MEX_FLAGS
"-L
${
FAUST_BIN_DIR
}
"
"-l
${
FAUST_TARGET
}
"
)
if
(
FAUST_USE
_OPENBLAS
)
if
(
BUILD
_OPENBLAS
)
set
(
LDD_MEX_FLAGS
"
${
LDD_MEX_FLAGS
}
"
"
${
OPENBLAS_LIB_FILE
}
"
)
endif
()
elseif
(
WIN32
)
...
...
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