Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: add missing 'flutter' directory to FLUTTER_SDK_PATH in Linux compiled.sh #11

Merged
merged 3 commits into from
Jun 7, 2024
Merged

fix: add missing 'flutter' directory to FLUTTER_SDK_PATH in Linux compiled.sh #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c057257
fix: add missing 'flutter' directory to FLUTTER_SDK_PATH in Linux com…
May 22, 2024
9b7f1d2
cmake: fix custom command in common_local_lib_foot for Linux
Jun 7, 2024
90cbb86
link missing Matlab libs in mexex/jvxReadMat
Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-scripts/linux/debug/rt-sdk/compiled.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

JVX_RELEASE_TYPE=Debug
JVX_SRC_PATH=$PWD/..
export FLUTTER_SDK_PATH=${JVX_SRC_PATH}/sources/jvxLibraries/third_party/web/flutter-3.7.4
export FLUTTER_SDK_PATH=${JVX_SRC_PATH}/sources/jvxLibraries/third_party/web/flutter/flutter-3.7.4
## QT_PATH_64=${JVX_SRC_PATH}/sources/jvxLibraries/third_party/web/qt/qt/5.15.2/gcc_64
## AQT install path

Expand Down
1 change: 1 addition & 0 deletions cmake/common_local_lib_foot.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,7 @@ if (LOCAL_MATCONF_SCRIPTS OR USES_OTHER_LOCAL_MATCONF_SCRIPTS)
ARGS ${MATLAB_START_FLAGS} -r "global arg_list; arg_list = { ${__MATLAB_TMP_LIST} }; run('${LOCAL_MATCONF_SCRIPT}'); exit;"
OUTPUT ${OUTFILE}
DEPENDS ${LOCAL_MATCONF_SCRIPT} ${Matlab_MAIN_PROGRAM}
VERBATIM
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
)
set(GENERATED_FILES ${GENERATED_FILES} ${OUTFILE})
Expand Down
2 changes: 2 additions & 0 deletions cmake/linux.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,7 @@ macro (find_matlab)
set(Matlab_INCLUDE_DIRS ${MATLAB_PATH}/extern/include)
set(MATLAB_PATH_LIB ${MATLAB_PATH}/bin/${MATLAB_MEX_SUBDIR})
set(JVX_SYSTEM_MATLAB_MEX_LIBRARIES libmx.so libmat.so libmex.so)
set(JVX_SYSTEM_MATLAB_MEXEX_LIBRARIES libmx.so libmat.so)
else()
message("XX> could not find Matlab, deactivating support")
set(JVX_USE_PART_MATLAB OFF)
Expand All @@ -204,6 +205,7 @@ macro (find_matlab)
set(Matlab_INCLUDE_DIRS ${MATLAB_PATH}/extern/include)
set(MATLAB_PATH_LIB ${MATLAB_PATH}/bin/${MATLAB_MEX_SUBDIR})
set(JVX_SYSTEM_MATLAB_MEX_LIBRARIES "${MATLAB_PATH_LIB}/libmex.so;${MATLAB_PATH_LIB}/libmx.so;${MATLAB_PATH_LIB}/libmat.so" )
set(JVX_SYSTEM_MATLAB_MEXEX_LIBRARIES "${MATLAB_PATH_LIB}/libmx.so;${MATLAB_PATH_LIB}/libmat.so" )
set(JVX_CMAKE_LINKER_FLAGS_MATLAB_MEX "-Wl,--no-undefined -Wl,--retain-symbols-file=${JVX_BASE_ROOT}/software/exports/components/linux/exports-mex.def -Wl,-rpath-link,${MATLAB_LIB_PATH}")
else()
message("XX> could not find Matlab, deactivating support")
Expand Down
2 changes: 2 additions & 0 deletions sources/jvxApplications/mexex/jvxReadMat/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ include(${JVX_CMAKE_DIR}/common_local_exe_head.cmake)

include_directories(${Matlab_INCLUDE_DIRS})

set(LOCAL_LIBS ${JVX_SYSTEM_MATLAB_MEXEX_LIBRARIES})

set(LOCAL_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/../target/main.cpp
# ${JVX_BASE_ROOT}/software/codeFragments/matlab_c/CjvxCToMatlabConverter.cpp
Expand Down
Loading