From a08323ea6b3706191bbd546fcbfcd5d321e0ac92 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Fri, 7 Jun 2019 15:34:02 +0200 Subject: Try with a direct link to mathjax website --- src/Doxyfile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Doxyfile.in b/src/Doxyfile.in index 1c293d1c..9a6a3074 100644 --- a/src/Doxyfile.in +++ b/src/Doxyfile.in @@ -1440,7 +1440,7 @@ MATHJAX_FORMAT = HTML-CSS # The default value is: http://cdn.mathjax.org/mathjax/latest. # This tag requires that the tag USE_MATHJAX is set to YES. -MATHJAX_RELPATH = ../common +MATHJAX_RELPATH = https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.2 # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax # extension names that should be enabled during MathJax rendering. For example -- cgit v1.2.3 From 18e07282a3b9b1e8616ca871d79d7dc820e94a85 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Fri, 7 Jun 2019 15:50:31 +0200 Subject: MathJax.js no more required --- src/common/doc/MathJax.js | 53 ----------------------------------------------- 1 file changed, 53 deletions(-) delete mode 100644 src/common/doc/MathJax.js diff --git a/src/common/doc/MathJax.js b/src/common/doc/MathJax.js deleted file mode 100644 index 35e1994e..00000000 --- a/src/common/doc/MathJax.js +++ /dev/null @@ -1,53 +0,0 @@ -(function () { - var newMathJax = 'https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.1/MathJax.js'; - var oldMathJax = 'cdn.mathjax.org/mathjax/latest/MathJax.js'; - - var replaceScript = function (script, src) { - // - // Make redirected script - // - var newScript = document.createElement('script'); - newScript.src = newMathJax + src.replace(/.*?(\?|$)/, '$1'); - // - // Move onload and onerror handlers to new script - // - newScript.onload = script.onload; - newScript.onerror = script.onerror; - script.onload = script.onerror = null; - // - // Move any content (old-style configuration scripts) - // - while (script.firstChild) newScript.appendChild(script.firstChild); - // - // Copy script id - // - if (script.id != null) newScript.id = script.id; - // - // Replace original script with new one - // - script.parentNode.replaceChild(newScript, script); - // - // Issue a console warning - // - console.warn('WARNING: cdn.mathjax.org has been retired. Check https://www.mathjax.org/cdn-shutting-down/ for migration tips.') - } - - if (document.currentScript) { - var script = document.currentScript; - replaceScript(script, script.src); - } else { - // - // Look for current script by searching for one with the right source - // - var n = oldMathJax.length; - var scripts = document.getElementsByTagName('script'); - for (var i = 0; i < scripts.length; i++) { - var script = scripts[i]; - var src = (script.src || '').replace(/.*?:\/\//,''); - if (src.substr(0, n) === oldMathJax) { - replaceScript(script, src); - break; - } - } - } -})(); \ No newline at end of file -- cgit v1.2.3 From 456eadd7e6da04c6d35f02a79d3aa78e5d7bc970 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Jun 2019 09:49:23 +0200 Subject: Comment what fails --- .appveyor.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index dea0fc15..e481c62f 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -41,9 +41,7 @@ init: install: - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PYTHON%\Library\bin;%PATH% - - "ECHO %PYTHON%" - SET PYTHONPATH=%PYTHON%\\Lib\\site-packages;%PYTHONPATH% - - "ECHO %PYTHONPATH%" - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 - python --version - pip --version @@ -57,11 +55,9 @@ build_script: - if [%target%]==[Python] ( ECHO %PYTHONPATH% & cd src/cython & - Type setup.py & python setup.py install & - DIR %PYTHON%\\Lib\\site-packages & - python -c "import gudhi; print(gudhi.__version__)" & - MSBuild RUN_TESTS.vcxproj + ECHO This fails : python -c "import gudhi; print(gudhi.__version__)" & + ECHO This fails : MSBuild RUN_TESTS.vcxproj ) else ( MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 & ctest -j 1 -C Release -E diff_files -- cgit v1.2.3 From 1d299f3f21bf5f4acc4e8d19cf3dcde6c3045133 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Jun 2019 09:59:36 +0200 Subject: Seperate build and tests --- .appveyor.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index e481c62f..82520c40 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -56,9 +56,16 @@ build_script: ECHO %PYTHONPATH% & cd src/cython & python setup.py install & - ECHO This fails : python -c "import gudhi; print(gudhi.__version__)" & - ECHO This fails : MSBuild RUN_TESTS.vcxproj ) else ( MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 & - ctest -j 1 -C Release -E diff_files ) + +test_script: + - cd build + - if [%target%]==[Python] ( + cd src/cython & + python -c "import gudhi; print(gudhi.__version__)" & + ECHO MSBuild RUN_TESTS.vcxproj + ) else ( + ctest -j 1 -C Release -E diff_files + ) \ No newline at end of file -- cgit v1.2.3 From b8185dff1a17a7101b043554a1bf688366c377de Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Jun 2019 10:18:52 +0200 Subject: fix typo --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 82520c40..22c204b6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -55,7 +55,7 @@ build_script: - if [%target%]==[Python] ( ECHO %PYTHONPATH% & cd src/cython & - python setup.py install & + python setup.py install ) else ( MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 & ) -- cgit v1.2.3 From 2180529dd41471f08da8ccfb026338f98eed918c Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Jun 2019 10:22:59 +0200 Subject: fix typo --- .appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.appveyor.yml b/.appveyor.yml index 22c204b6..10b0d29c 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -57,7 +57,7 @@ build_script: cd src/cython & python setup.py install ) else ( - MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 & + MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 ) test_script: -- cgit v1.2.3 From d6f72bae8c30cab74c92c6ee98f4da961059000a Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Jun 2019 10:36:29 +0200 Subject: print sys.path --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index 10b0d29c..e41da62d 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -64,6 +64,7 @@ test_script: - cd build - if [%target%]==[Python] ( cd src/cython & + python -c "import sys; print(sys.path)" & python -c "import gudhi; print(gudhi.__version__)" & ECHO MSBuild RUN_TESTS.vcxproj ) else ( -- cgit v1.2.3 From a3ff485140593e5c9c1471ed6fe8add2b209ac16 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Jun 2019 11:01:42 +0200 Subject: Add vcpkg dll path to the PATH --- .appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.appveyor.yml b/.appveyor.yml index e41da62d..3d109a75 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -40,6 +40,7 @@ init: install: - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows + - SET PATH=c:\Tools\vcpkg\installed\x86-windows\bin;%PATH% - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PYTHON%\Library\bin;%PATH% - SET PYTHONPATH=%PYTHON%\\Lib\\site-packages;%PYTHONPATH% - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 @@ -63,6 +64,7 @@ build_script: test_script: - cd build - if [%target%]==[Python] ( + dumpbin /dependents %PYTHON%\\Lib\\site-packages\\ cd src/cython & python -c "import sys; print(sys.path)" & python -c "import gudhi; print(gudhi.__version__)" & -- cgit v1.2.3 From 7bbb2f4dbdca006a18c08d6bebb6782c19fc649e Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Jun 2019 11:09:58 +0200 Subject: Add dumpbin to find dll dependencies --- .appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 3d109a75..d3f44b32 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -40,7 +40,7 @@ init: install: - vcpkg install tbb:x64-windows boost-disjoint-sets:x64-windows boost-serialization:x64-windows boost-date-time:x64-windows boost-system:x64-windows boost-filesystem:x64-windows boost-units:x64-windows boost-thread:x64-windows boost-program-options:x64-windows eigen3:x64-windows mpfr:x64-windows mpir:x64-windows cgal:x64-windows - - SET PATH=c:\Tools\vcpkg\installed\x86-windows\bin;%PATH% + - SET PATH=c:\Tools\vcpkg\installed\x64-windows\bin;%PATH% - SET PATH=%PYTHON%;%PYTHON%\Scripts;%PYTHON%\Library\bin;%PATH% - SET PYTHONPATH=%PYTHON%\\Lib\\site-packages;%PYTHONPATH% - CALL "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64 @@ -64,7 +64,7 @@ build_script: test_script: - cd build - if [%target%]==[Python] ( - dumpbin /dependents %PYTHON%\\Lib\\site-packages\\ + dumpbin /dependents %PYTHON%\\Lib\\site-packages\\gudhi.cp37-win_amd64.pyd cd src/cython & python -c "import sys; print(sys.path)" & python -c "import gudhi; print(gudhi.__version__)" & -- cgit v1.2.3 From 3c0f3dc1a42ddd0b6af4b605f880d36664971bd0 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Jun 2019 11:17:05 +0200 Subject: Let's try --- .appveyor.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index d3f44b32..ef1b4de9 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -54,7 +54,6 @@ build_script: - cd build - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake .. - if [%target%]==[Python] ( - ECHO %PYTHONPATH% & cd src/cython & python setup.py install ) else ( @@ -64,11 +63,9 @@ build_script: test_script: - cd build - if [%target%]==[Python] ( - dumpbin /dependents %PYTHON%\\Lib\\site-packages\\gudhi.cp37-win_amd64.pyd cd src/cython & - python -c "import sys; print(sys.path)" & python -c "import gudhi; print(gudhi.__version__)" & - ECHO MSBuild RUN_TESTS.vcxproj + MSBuild RUN_TESTS.vcxproj ) else ( ctest -j 1 -C Release -E diff_files ) \ No newline at end of file -- cgit v1.2.3 From 8a9c74ecfa011904ac0c57b054c12f3889686958 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Jun 2019 13:23:22 +0200 Subject: Add traces --- .appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.appveyor.yml b/.appveyor.yml index ef1b4de9..49405619 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -63,6 +63,7 @@ build_script: test_script: - cd build - if [%target%]==[Python] ( + DIR src/cython & cd src/cython & python -c "import gudhi; print(gudhi.__version__)" & MSBuild RUN_TESTS.vcxproj -- cgit v1.2.3 From a6fbf3763510592154fb004ff484aa8c15c5bf35 Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Jun 2019 13:33:55 +0200 Subject: Merge build and tests --- .appveyor.yml | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 49405619..c6475f2e 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -55,18 +55,9 @@ build_script: - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake .. - if [%target%]==[Python] ( cd src/cython & - python setup.py install - ) else ( - MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 - ) - -test_script: - - cd build - - if [%target%]==[Python] ( - DIR src/cython & - cd src/cython & - python -c "import gudhi; print(gudhi.__version__)" & + python setup.py install & MSBuild RUN_TESTS.vcxproj ) else ( + MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 & ctest -j 1 -C Release -E diff_files - ) \ No newline at end of file + ) -- cgit v1.2.3 From ba1055e7e267095cf9a35a74116f53ad326697fa Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Jun 2019 13:39:51 +0200 Subject: Shall be good --- .appveyor.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index c6475f2e..31eb48d4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,17 +13,17 @@ environment: APPVEYOR_SAVE_CACHE_ON_ERROR: true matrix: -# - target: Examples -# CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF -# PYTHON: "C:\\Python37-x64" -# -# - target: UnitaryTests -# CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF -# PYTHON: "C:\\Python37-x64" -# -# - target: Utilities -# CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF -# PYTHON: "C:\\Python37-x64" + - target: Examples + CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF + PYTHON: "C:\\Python37-x64" + + - target: UnitaryTests + CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF + PYTHON: "C:\\Python37-x64" + + - target: Utilities + CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF + PYTHON: "C:\\Python37-x64" - target: Python CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/Tools/vcpkg/installed/x64-windows/lib" -- cgit v1.2.3 From 5e96f167e9f8d847ed82b37dd82bdfd60202660d Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Jun 2019 15:34:36 +0200 Subject: Verbose Alpha_complex_unit_test as it fails --- .appveyor.yml | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 31eb48d4..cd562b75 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,21 +13,21 @@ environment: APPVEYOR_SAVE_CACHE_ON_ERROR: true matrix: - - target: Examples - CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF - PYTHON: "C:\\Python37-x64" +# - target: Examples +# CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF +# PYTHON: "C:\\Python37-x64" - target: UnitaryTests CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF PYTHON: "C:\\Python37-x64" - - target: Utilities - CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF - PYTHON: "C:\\Python37-x64" +# - target: Utilities +# CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF +# PYTHON: "C:\\Python37-x64" - - target: Python - CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/Tools/vcpkg/installed/x64-windows/lib" - PYTHON: "C:\\Python37-x64" +# - target: Python +# CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/Tools/vcpkg/installed/x64-windows/lib" +# PYTHON: "C:\\Python37-x64" cache: @@ -53,11 +53,13 @@ build_script: - mkdir build - cd build - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake .. - - if [%target%]==[Python] ( - cd src/cython & - python setup.py install & - MSBuild RUN_TESTS.vcxproj - ) else ( - MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 & - ctest -j 1 -C Release -E diff_files - ) + - MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 + - ctest -j 1 -C Release -R Alpha_complex_test_unit -V +# - if [%target%]==[Python] ( +# cd src/cython & +# python setup.py install & +# MSBuild RUN_TESTS.vcxproj +# ) else ( +# MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 & +# ctest -j 1 -C Release -E diff_files +# ) -- cgit v1.2.3 From 8867d40f40c4d35fa2988e8b70b0290744d9c74a Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Jun 2019 16:27:44 +0200 Subject: try to fix Alpha_complex_test_unit on windows --- src/Alpha_complex/test/Alpha_complex_unit_test.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Alpha_complex/test/Alpha_complex_unit_test.cpp b/src/Alpha_complex/test/Alpha_complex_unit_test.cpp index 622fcae8..b46b6da5 100644 --- a/src/Alpha_complex/test/Alpha_complex_unit_test.cpp +++ b/src/Alpha_complex/test/Alpha_complex_unit_test.cpp @@ -42,7 +42,7 @@ // Use dynamic_dimension_tag for the user to be able to set dimension typedef CGAL::Epick_d< CGAL::Dynamic_dimension_tag > Kernel_d; // Use static dimension_tag for the user not to be able to set dimension -typedef CGAL::Epick_d< CGAL::Dimension_tag<2> > Kernel_s; +typedef CGAL::Epick_d< CGAL::Dimension_tag<3> > Kernel_s; // The triangulation uses the default instantiation of the TriangulationDataStructure template parameter typedef boost::mpl::list list_of_kernel_variants; -- cgit v1.2.3 From f58f0bb2cb99076d0cd3a11ad39f3277213e3f5e Mon Sep 17 00:00:00 2001 From: ROUVREAU Vincent Date: Tue, 11 Jun 2019 17:16:18 +0200 Subject: Shall be good --- .appveyor.yml | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index cd562b75..31eb48d4 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -13,21 +13,21 @@ environment: APPVEYOR_SAVE_CACHE_ON_ERROR: true matrix: -# - target: Examples -# CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF -# PYTHON: "C:\\Python37-x64" + - target: Examples + CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF + PYTHON: "C:\\Python37-x64" - target: UnitaryTests CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=ON -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=OFF PYTHON: "C:\\Python37-x64" -# - target: Utilities -# CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF -# PYTHON: "C:\\Python37-x64" + - target: Utilities + CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=ON -DWITH_GUDHI_PYTHON=OFF + PYTHON: "C:\\Python37-x64" -# - target: Python -# CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/Tools/vcpkg/installed/x64-windows/lib" -# PYTHON: "C:\\Python37-x64" + - target: Python + CMAKE_FLAGS: -DWITH_GUDHI_EXAMPLE=OFF -DWITH_GUDHI_TEST=OFF -DWITH_GUDHI_UTILITIES=OFF -DWITH_GUDHI_PYTHON=ON -DGMP_INCLUDE_DIR="c:/Tools/vcpkg/installed/x64-windows/include" -DGMP_LIBRARIES="c:/Tools/vcpkg/installed/x64-windows/lib/mpir.lib" -DGMP_LIBRARIES_DIR="c:/Tools/vcpkg/installed/x64-windows/lib" + PYTHON: "C:\\Python37-x64" cache: @@ -53,13 +53,11 @@ build_script: - mkdir build - cd build - cmake -G "Visual Studio 15 2017 Win64" %CMAKE_FLAGS% -DCMAKE_TOOLCHAIN_FILE=c:/Tools/vcpkg/scripts/buildsystems/vcpkg.cmake .. - - MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 - - ctest -j 1 -C Release -R Alpha_complex_test_unit -V -# - if [%target%]==[Python] ( -# cd src/cython & -# python setup.py install & -# MSBuild RUN_TESTS.vcxproj -# ) else ( -# MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 & -# ctest -j 1 -C Release -E diff_files -# ) + - if [%target%]==[Python] ( + cd src/cython & + python setup.py install & + MSBuild RUN_TESTS.vcxproj + ) else ( + MSBuild GUDHIdev.sln /m /p:Configuration=Release /p:Platform=x64 & + ctest -j 1 -C Release -E diff_files + ) -- cgit v1.2.3