From d69471f98545cf89d3bdd809e95134f95e39d35d Mon Sep 17 00:00:00 2001 From: Enrico Bertolazzi Date: Thu, 7 Apr 2022 00:34:04 +0200 Subject: [PATCH] tenporaneo --- toolbox/bin/BaseHermiteMexWrapper.m | 0 toolbox/bin/Spline1DMexWrapper.m | 0 toolbox/bin/Spline2DMexWrapper.m | 0 toolbox/bin/SplineSetMexWrapper.m | 0 toolbox/bin/SplineVecMexWrapper.m | 0 toolbox/lib/CMakeLists.txt | 14 +++++++++++--- toolbox/lib/CompileSplinesLib_cmake.m | 11 +++++++++-- 7 files changed, 20 insertions(+), 5 deletions(-) mode change 100755 => 100644 toolbox/bin/BaseHermiteMexWrapper.m mode change 100755 => 100644 toolbox/bin/Spline1DMexWrapper.m mode change 100755 => 100644 toolbox/bin/Spline2DMexWrapper.m mode change 100755 => 100644 toolbox/bin/SplineSetMexWrapper.m mode change 100755 => 100644 toolbox/bin/SplineVecMexWrapper.m diff --git a/toolbox/bin/BaseHermiteMexWrapper.m b/toolbox/bin/BaseHermiteMexWrapper.m old mode 100755 new mode 100644 diff --git a/toolbox/bin/Spline1DMexWrapper.m b/toolbox/bin/Spline1DMexWrapper.m old mode 100755 new mode 100644 diff --git a/toolbox/bin/Spline2DMexWrapper.m b/toolbox/bin/Spline2DMexWrapper.m old mode 100755 new mode 100644 diff --git a/toolbox/bin/SplineSetMexWrapper.m b/toolbox/bin/SplineSetMexWrapper.m old mode 100755 new mode 100644 diff --git a/toolbox/bin/SplineVecMexWrapper.m b/toolbox/bin/SplineVecMexWrapper.m old mode 100755 new mode 100644 diff --git a/toolbox/lib/CMakeLists.txt b/toolbox/lib/CMakeLists.txt index 31874159..3cc2dc05 100644 --- a/toolbox/lib/CMakeLists.txt +++ b/toolbox/lib/CMakeLists.txt @@ -21,9 +21,14 @@ endforeach() include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../src ${CMAKE_CURRENT_SOURCE_DIR}/../src/Utils ) -if ( (UNIX OR LINUX) AND NOT APPLE ) - set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++") - set(CMAKE_SHARED_LINKER_FLAGS "-static-libgcc -static-libstdc++") +if ( UNIX OR LINUX ) + if ( NOT APPLE ) + set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++") + set(CMAKE_SHARED_LINKER_FLAGS "-static-libgcc -static-libstdc++") + endif() +else() + #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mwindows") + add_definitions(-mwindows) endif() set( MEX_LIST BaseHermite Spline1D Spline2D SplineSet SplineVec ) @@ -37,4 +42,7 @@ foreach( BASE ${MEX_LIST}) "$" "${CMAKE_CURRENT_SOURCE_DIR}/../bin" ) + + target_link_libraries( ${BASE}MexWrapper ws2_32.lib iphlpapi.lib iphlpapi.lib kernel32.lib winpthread ) + endforeach() diff --git a/toolbox/lib/CompileSplinesLib_cmake.m b/toolbox/lib/CompileSplinesLib_cmake.m index 0d9f8817..f2027206 100644 --- a/toolbox/lib/CompileSplinesLib_cmake.m +++ b/toolbox/lib/CompileSplinesLib_cmake.m @@ -15,7 +15,14 @@ end old_dir = cd(fileparts(which(mfilename))); -system('cmake -Bbuild .'); -system('cmake --build build --parallel 8'); +%system('rmdir /S build'); +if isunix + system('cmake -Bbuild .'); + system('cd build; make -j 10; cd ..'); +elseif ispc + system('cmake -G "MinGW Makefiles" -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -Bbuild .'); + system('cd build && make -j 10 && cd ..'); +end +%system('cmake --build build --parallel 8'); cd(old_dir);