Mentions légales du service

Skip to content
Snippets Groups Projects
Commit ea7971dc authored by hhakim's avatar hhakim
Browse files

Stop relying on HDF5 and SZIP (matio dependencies) objects for compiling...

Stop relying on HDF5 and SZIP (matio dependencies) objects for compiling matfaust mex-s (as did for pyfaust in 52915f27).
parent 5b81962d
Branches
Tags
No related merge requests found
...@@ -210,8 +210,6 @@ foreach(mex_target ${MEXFILE_TARGET_LIST}) ...@@ -210,8 +210,6 @@ foreach(mex_target ${MEXFILE_TARGET_LIST})
# previous call is not necessary, to verify, you can check the build file generated for msbuild # previous call is not necessary, to verify, you can check the build file generated for msbuild
# for example wrapper/matlab/mex/mexFaustReal.vcxproj (it should contain a tag OpenMPSupport to True) # for example wrapper/matlab/mex/mexFaustReal.vcxproj (it should contain a tag OpenMPSupport to True)
target_compile_options(${mex_target} PRIVATE "/VERBOSE") # doesn't work at least with MSVC target_compile_options(${mex_target} PRIVATE "/VERBOSE") # doesn't work at least with MSVC
# complete static libs (linked later) by objects of libs if needed (fallback solution from environment)
target_link_options(${mex_target} PRIVATE $ENV{WIN_HDF5_OBJS_DIR}/*.obj $ENV{WIN_SZIP_OBJS_DIR}/*.obj)
target_compile_definitions(${mex_target} PRIVATE NOMINMAX) target_compile_definitions(${mex_target} PRIVATE NOMINMAX)
else() else()
target_link_options(${mex_target} PRIVATE ${OpenMP_CXX_LIBRARIES}) # do nothing if BUILD_MULTITHREAD is OFF target_link_options(${mex_target} PRIVATE ${OpenMP_CXX_LIBRARIES}) # do nothing if BUILD_MULTITHREAD is OFF
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment