From b9bea456e64dcd9f1d06006cae66de7b03a15511 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Thu, 9 Aug 2018 14:40:20 +0000 Subject: GUDHI_CAN_USE_CXX11_THREAD_LOCAL was missing in Persistent_cohomology::annotation_of_the_boundary git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3764 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 7d53de701470203e48f76896e2859d1df670564c --- src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h index c68b5c0b..c51e47a5 100644 --- a/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h +++ b/src/Persistent_cohomology/include/gudhi/Persistent_cohomology.h @@ -300,7 +300,10 @@ class Persistent_cohomology { // with multiplicity. We used to sum the coefficients directly in // annotations_in_boundary by using a map, we now do it later. typedef std::pair annotation_t; - thread_local std::vector annotations_in_boundary; +#ifdef GUDHI_CAN_USE_CXX11_THREAD_LOCAL + thread_local +#endif // GUDHI_CAN_USE_CXX11_THREAD_LOCAL + std::vector annotations_in_boundary; annotations_in_boundary.clear(); int sign = 1 - 2 * (dim_sigma % 2); // \in {-1,1} provides the sign in the // alternate sum in the boundary. -- cgit v1.2.3 From 254faabb0e3f8f89aad6629211ba059798921924 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Thu, 9 Aug 2018 15:16:58 +0000 Subject: Copyright clarification for human.off file git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3765 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: b3da155682259c8df1cabb587c8d60c79c75cdc9 --- data/points/human.COPYRIGHT | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 data/points/human.COPYRIGHT diff --git a/data/points/human.COPYRIGHT b/data/points/human.COPYRIGHT new file mode 100644 index 00000000..320e3e51 --- /dev/null +++ b/data/points/human.COPYRIGHT @@ -0,0 +1,15 @@ +The human.off point cloud is available at this webpage : +http://segeval.cs.princeton.edu/ + +Models in the Shape Repository are made freely available for research +and non-commercial purposes only. Use of these models for commercial +purposes is permitted only after the express approval of the Shape +Repository and the onwner has been obtained. Please contact Princeton +University by using the webform on their site in this regard. + +Citation + +If you use any part of this benchmark, please cite: +Xiaobai Chen, Aleksey Golovinskiy, and Thomas Funkhouser, +A Benchmark for 3D Mesh Segmentation +ACM Transactions on Graphics (Proc. SIGGRAPH), 28(3), 2009. -- cgit v1.2.3 From f5e9df9ed11134971194c2801cf166ff4f931e2d Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Thu, 9 Aug 2018 15:23:26 +0000 Subject: Make human.off copyright clearer git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3766 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 6d79fe7a1d0892476e70fd255a7cd0cef0d08823 --- data/points/human.COPYRIGHT | 68 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 65 insertions(+), 3 deletions(-) diff --git a/data/points/human.COPYRIGHT b/data/points/human.COPYRIGHT index 320e3e51..cb9bdb59 100644 --- a/data/points/human.COPYRIGHT +++ b/data/points/human.COPYRIGHT @@ -1,15 +1,77 @@ The human.off point cloud is available at this webpage : http://segeval.cs.princeton.edu/ +LICENSE +======= + +AIM@SHAPE General License for Shapes +Applicable terms +---------------- + +This is the general AIM@SHAPE license applicable to models in the +Shape Repository. It should be noted that each model is a +representation of, and is distinct from, a shape, whether physical or +imaginary. While the shape may be subject to its own terms, the terms +governing the model you are about to download are described herein. + +For some models, the owners have defined specific licenses. The terms +and conditions laid down in these licenses are in addition to the +terms prescribed here, and are to be adhered to strictly when using +such models. + +Acknowledgements +---------------- + +When including models from the Shape Repository in your website or +research work, or when using them for other purposes allowed by the +terms described herein, the AIM@SHAPE project and the model owner must +be acknowledged as the sources of the models, for example with the +phrase, "... model is provided courtesy of by the +AIM@SHAPE Shape Repository." + +Information on is present in the accompanying metadata +files and, where present, owner licenses. + +Metadata +-------- + +Each model is accompanied by its metadata file. Please keep this file +with the model as it contains important information about the +model. Please let us know if you find any errors in the metadata. + +(Im)proper use +-------------- + +Some models in the Shape Repository represent artifacts of religious, +cultural and/or historical significance, e.g. the Max Planck +model. Such models have been entrusted to the Shape Repository under +the hope that they will be used respectfully and +conscientiously. Please refrain from conducting experiments on them +that may be rash or insensitive to people's feelings. Such experiments +include, but are not limited to, morphing, animation, boolean +operations, simulations of burning, breaking, exploding and melting. + Models in the Shape Repository are made freely available for research and non-commercial purposes only. Use of these models for commercial purposes is permitted only after the express approval of the Shape -Repository and the onwner has been obtained. Please contact Princeton -University by using the webform on their site in this regard. +Repository and the onwner has been obtained. Please contact us using +the webform on our site in this regard. + -Citation +CITATION +======== If you use any part of this benchmark, please cite: Xiaobai Chen, Aleksey Golovinskiy, and Thomas Funkhouser, A Benchmark for 3D Mesh Segmentation ACM Transactions on Graphics (Proc. SIGGRAPH), 28(3), 2009. + +@article{Chen:2009:ABF, + author = "Xiaobai Chen and Aleksey Golovinskiy and Thomas Funkhouser", + title = "A Benchmark for {3D} Mesh Segmentation", + journal = "ACM Transactions on Graphics (Proc. SIGGRAPH)", + year = "2009", + month = aug, + volume = "28", + number = "3" +} \ No newline at end of file -- cgit v1.2.3 From bbf184b036c0b740b3fb0a95f5ce53dfa6151b52 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Mon, 13 Aug 2018 14:18:44 +0000 Subject: Modify GUDHIConfig.cmake in order to have : Order is : 1. user defined GUDHI_INCLUDE_DIRS 2. ${CMAKE_SOURCE_DIR}/include => Where the 'cmake' has been done 3. ${CMAKE_INSTALL_PREFIX}/include => Where the 'make install' has been performed git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3775 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 506357257ce261cb2778e357ca902401da4838e7 --- src/CMakeLists.txt | 2 +- src/GUDHIConfig.cmake.in | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index c60346d5..6c446104 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -71,7 +71,7 @@ export(PACKAGE GUDHI) message("++ make install will install ${PROJECT_NAME} in the following directory : ${CMAKE_INSTALL_PREFIX}") # Create the GUDHIConfig.cmake and GUDHIConfigVersion files -set(CONF_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include") +set(CONF_INCLUDE_DIRS "${CMAKE_SOURCE_DIR}/include;${CMAKE_INSTALL_PREFIX}/include") configure_file(GUDHIConfig.cmake.in "${PROJECT_BINARY_DIR}/GUDHIConfig.cmake" @ONLY) configure_file(GUDHIConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/GUDHIConfigVersion.cmake" @ONLY) diff --git a/src/GUDHIConfig.cmake.in b/src/GUDHIConfig.cmake.in index 02b540dc..8d82f235 100644 --- a/src/GUDHIConfig.cmake.in +++ b/src/GUDHIConfig.cmake.in @@ -1,7 +1,12 @@ # - Config file for the GUDHI package # It defines the following variables # GUDHI_INCLUDE_DIRS - include directories for GUDHI +# +# Order is : +# 1. user defined GUDHI_INCLUDE_DIRS +# 2. ${CMAKE_SOURCE_DIR}/include => Where the 'cmake' has been done +# 3. ${CMAKE_INSTALL_PREFIX}/include => Where the 'make install' has been performed # Compute paths -set(GUDHI_INCLUDE_DIRS "@CONF_INCLUDE_DIRS@") +set(GUDHI_INCLUDE_DIRS "${GUDHI_INCLUDE_DIRS};@CONF_INCLUDE_DIRS@") -- cgit v1.2.3 From 0784baddd1392727289a972b8374b3c2dca940a9 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Mon, 13 Aug 2018 16:03:54 +0000 Subject: Clarify installation, utilities and examples generation Add a link to the Hello GUDHI World project git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3776 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: bb4dea879baac0280b38ee7ab9f466e0c090a38c --- src/common/doc/installation.h | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) diff --git a/src/common/doc/installation.h b/src/common/doc/installation.h index 12407c18..c27e4f56 100644 --- a/src/common/doc/installation.h +++ b/src/common/doc/installation.h @@ -2,22 +2,34 @@ * \tableofcontents * As GUDHI is a header only library, there is no need to install the library. * - * Examples of GUDHI headers inclusion can be found in \ref demos. + * Examples of GUDHI headers inclusion can be found in \ref utilities. * * \section compiling Compiling * The library uses c++11 and requires Boost ≥ 1.48.0 * and CMake ≥ 3.1. * It is a multi-platform library and compiles on Linux, Mac OSX and Visual Studio 2015. * - * \subsection demos Demos and examples - * To build the demos and examples, run the following commands in a terminal: + * \subsection utilities Utilities and examples + * To build the utilities, run the following commands in a terminal: \verbatim cd /path-to-gudhi/ mkdir build cd build/ cmake .. make \endverbatim - * A list of examples is available here. + * By default, examples are disabled. You can activate their compilation with + * ccmake (on Linux and Mac OSX), + * cmake-gui (on Windows) or y mofifying the + * cmake command as follows : +\verbatim cmake -DWITH_GUDHI_EXAMPLE=ON .. +make \endverbatim + * A list of utilities and examples is available here. * + * \subsection libraryinstallation Installation + * To install the library (headers and activated utilities), run the following command in a terminal: + * \verbatim make install \endverbatim + * This action may require to be in the sudoer or administrator of the machine in function of the operating system and + * of CMAKE_INSTALL_PREFIX. + * * \subsection testsuites Test suites * To test your build, run the following command in a terminal: * \verbatim make test \endverbatim @@ -30,6 +42,10 @@ make doxygen # Documentation will be generated in the folder YYYY-MM-DD-hh-mm-ss_GUDHI_X.Y.Z/doc/html/ # You can customize the directory name by calling `cmake -DUSER_VERSION_DIR=/my/custom/folder` \endverbatim + * + * \subsection helloworld Hello world ! + * The Hello world for GUDHI + * project is an example to help developers to make their own C++ project on top of the GUDHI library. * * \section optionallibrary Optional third-party library * \subsection gmp GMP -- cgit v1.2.3 From dd7a618201b0ef34b6071b6c00164bb768903f97 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Thu, 30 Aug 2018 07:52:10 +0000 Subject: 2.3.0 release candidate 1 git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3843 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 692e39199c43a36297c58053b8beff28fea838d9 --- CMakeGUDHIVersion.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index 6811d7e1..8a36e7ce 100644 --- a/CMakeGUDHIVersion.txt +++ b/CMakeGUDHIVersion.txt @@ -1,6 +1,6 @@ set (GUDHI_MAJOR_VERSION 2) -set (GUDHI_MINOR_VERSION 2) -set (GUDHI_PATCH_VERSION 0) +set (GUDHI_MINOR_VERSION 3) +set (GUDHI_PATCH_VERSION 0.rc1) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") -- cgit v1.2.3 From 0f59a8c583ac1bd9dd37057682038f44723de104 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Thu, 30 Aug 2018 09:33:12 +0000 Subject: A thread_local was missing git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3845 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 739268e9feab840a1d8a405dad696ca95330623a --- src/Simplex_tree/include/gudhi/Simplex_tree.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Simplex_tree/include/gudhi/Simplex_tree.h b/src/Simplex_tree/include/gudhi/Simplex_tree.h index ee96d5a2..3ab23c12 100644 --- a/src/Simplex_tree/include/gudhi/Simplex_tree.h +++ b/src/Simplex_tree/include/gudhi/Simplex_tree.h @@ -1057,7 +1057,10 @@ class Simplex_tree { Dictionary_it next = siblings->members().begin(); ++next; - thread_local std::vector > inter; +#ifdef GUDHI_CAN_USE_CXX11_THREAD_LOCAL + thread_local +#endif // GUDHI_CAN_USE_CXX11_THREAD_LOCAL + std::vector > inter; for (Dictionary_it s_h = siblings->members().begin(); s_h != siblings->members().end(); ++s_h, ++next) { Simplex_handle root_sh = find_vertex(s_h->first); -- cgit v1.2.3 From fd22683d57dc9d0f244f8ec813c0a55e29570a38 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Thu, 30 Aug 2018 09:35:57 +0000 Subject: Release 2.3.0 candidate 2 git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3846 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 9f98adca342bf73ca150ffce8b6a8e42e4e8f30e --- CMakeGUDHIVersion.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index 8a36e7ce..a8317278 100644 --- a/CMakeGUDHIVersion.txt +++ b/CMakeGUDHIVersion.txt @@ -1,6 +1,6 @@ set (GUDHI_MAJOR_VERSION 2) set (GUDHI_MINOR_VERSION 3) -set (GUDHI_PATCH_VERSION 0.rc1) +set (GUDHI_PATCH_VERSION 0.rc2) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") -- cgit v1.2.3 -- cgit v1.2.3 From 30554aab477f1a189f7270326b706f09e681e24a Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Fri, 31 Aug 2018 09:24:41 +0000 Subject: Add debug traces git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/windows_cgal_non_header_only_compilation_issue@3851 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 00f56b397048aca87422e6da9385b2622acf1094 --- src/cython/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index 1849a6ec..97a99e59 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -1,7 +1,9 @@ project(Cython) function( add_gudhi_cython_lib THE_LIB ) + message("##### add_gudhi_cython_lib on ${THE_LIB}") if(EXISTS ${THE_LIB}) + message("##### EXISTS") get_filename_component(THE_LIB_FILE_NAME ${THE_LIB} NAME_WE) if(WIN32) message("++ ${THE_LIB} => THE_LIB_FILE_NAME = ${THE_LIB_FILE_NAME}") -- cgit v1.2.3 From 16c796735dafe95e4c93d80a0785f2a0a8e0e1cd Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Fri, 31 Aug 2018 09:34:26 +0000 Subject: Add debug traces git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/windows_cgal_non_header_only_compilation_issue@3852 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 1a99305e1bfab4d86f5a10371dbad3438f3b0580 --- src/cython/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index 97a99e59..37e3de79 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -132,6 +132,7 @@ if(CYTHON_FOUND) if(CGAL_FOUND) can_cgal_use_cxx11_thread_local() if (NOT CGAL_CAN_USE_CXX11_THREAD_LOCAL_RESULT) + message("##### add_gudhi_cython_lib on ${Boost_THREAD_LIBRARY}") add_gudhi_cython_lib(${Boost_THREAD_LIBRARY}) set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ") endif() @@ -141,6 +142,7 @@ if(CYTHON_FOUND) set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_HEADER_ONLY', ") else(CGAL_HEADER_ONLY) add_gudhi_debug_info("CGAL version ${CGAL_VERSION}") + message("##### add_gudhi_cython_lib on ${CGAL_LIBRARY}") add_gudhi_cython_lib(${CGAL_LIBRARY}) set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${CGAL_LIBRARIES_DIR}', ") # If CGAL is not header only, CGAL library may link with boost system, -- cgit v1.2.3 From 8d3550092122a71b70bd310d5fd9e9976bc0b9dd Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Fri, 31 Aug 2018 11:07:09 +0000 Subject: Add debug traces git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/windows_cgal_non_header_only_compilation_issue@3853 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: e8792fc3427cb4f4e92f3297aa3f4aea57c54e60 --- src/cython/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index 37e3de79..41230a69 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -132,7 +132,7 @@ if(CYTHON_FOUND) if(CGAL_FOUND) can_cgal_use_cxx11_thread_local() if (NOT CGAL_CAN_USE_CXX11_THREAD_LOCAL_RESULT) - message("##### add_gudhi_cython_lib on ${Boost_THREAD_LIBRARY}") + message("##### add_gudhi_cython_lib Boost_THREAD_LIBRARY - ${Boost_THREAD_LIBRARY}") add_gudhi_cython_lib(${Boost_THREAD_LIBRARY}) set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ") endif() @@ -142,10 +142,11 @@ if(CYTHON_FOUND) set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_HEADER_ONLY', ") else(CGAL_HEADER_ONLY) add_gudhi_debug_info("CGAL version ${CGAL_VERSION}") - message("##### add_gudhi_cython_lib on ${CGAL_LIBRARY}") + message("##### add_gudhi_cython_lib CGAL_LIBRARY - ${CGAL_LIBRARY}") add_gudhi_cython_lib(${CGAL_LIBRARY}) set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${CGAL_LIBRARIES_DIR}', ") # If CGAL is not header only, CGAL library may link with boost system, + message("##### add_gudhi_cython_lib Boost_SYSTEM_LIBRARY - ${Boost_SYSTEM_LIBRARY}") add_gudhi_cython_lib(${Boost_SYSTEM_LIBRARY}) set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ") endif(CGAL_HEADER_ONLY) @@ -153,6 +154,7 @@ if(CYTHON_FOUND) if(GMP_FOUND) add_gudhi_debug_info("GMP_LIBRARIES = ${GMP_LIBRARIES}") set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_USE_GMP', ") + message("##### add_gudhi_cython_lib GMP_LIBRARIES - ${GMP_LIBRARIES}") add_gudhi_cython_lib(${GMP_LIBRARIES}) set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${GMP_LIBRARIES_DIR}', ") if(GMPXX_FOUND) -- cgit v1.2.3 From 6048f92357bbce6de009c2441d9354e5f2f4b8ae Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Fri, 31 Aug 2018 11:16:58 +0000 Subject: Add CGAL_LIBRARIES git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/windows_cgal_non_header_only_compilation_issue@3854 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 0b8ee8cf61dca1b74481d556615e55caa39246ae --- src/cython/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index 41230a69..50355f84 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -142,6 +142,8 @@ if(CYTHON_FOUND) set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_HEADER_ONLY', ") else(CGAL_HEADER_ONLY) add_gudhi_debug_info("CGAL version ${CGAL_VERSION}") + message("##### add_gudhi_cython_lib CGAL_LIBRARIES - ${CGAL_LIBRARIES}") + add_gudhi_cython_lib(${CGAL_LIBRARIES}) message("##### add_gudhi_cython_lib CGAL_LIBRARY - ${CGAL_LIBRARY}") add_gudhi_cython_lib(${CGAL_LIBRARY}) set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${CGAL_LIBRARIES_DIR}', ") -- cgit v1.2.3 From fd7e0464bde1a357fda43ced4ff26b36bdc58a56 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Fri, 31 Aug 2018 11:23:50 +0000 Subject: Pass parameters to cmake function through double quote for unset variables case git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/windows_cgal_non_header_only_compilation_issue@3855 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 57ff4e884e6575cc7938da3937a7a0090567ad74 --- src/cython/CMakeLists.txt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index 50355f84..f9eccaa3 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -133,7 +133,7 @@ if(CYTHON_FOUND) can_cgal_use_cxx11_thread_local() if (NOT CGAL_CAN_USE_CXX11_THREAD_LOCAL_RESULT) message("##### add_gudhi_cython_lib Boost_THREAD_LIBRARY - ${Boost_THREAD_LIBRARY}") - add_gudhi_cython_lib(${Boost_THREAD_LIBRARY}) + add_gudhi_cython_lib("${Boost_THREAD_LIBRARY}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ") endif() # Add CGAL compilation args @@ -143,13 +143,13 @@ if(CYTHON_FOUND) else(CGAL_HEADER_ONLY) add_gudhi_debug_info("CGAL version ${CGAL_VERSION}") message("##### add_gudhi_cython_lib CGAL_LIBRARIES - ${CGAL_LIBRARIES}") - add_gudhi_cython_lib(${CGAL_LIBRARIES}) + add_gudhi_cython_lib("${CGAL_LIBRARIES}") message("##### add_gudhi_cython_lib CGAL_LIBRARY - ${CGAL_LIBRARY}") - add_gudhi_cython_lib(${CGAL_LIBRARY}) + add_gudhi_cython_lib("${CGAL_LIBRARY}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${CGAL_LIBRARIES_DIR}', ") # If CGAL is not header only, CGAL library may link with boost system, message("##### add_gudhi_cython_lib Boost_SYSTEM_LIBRARY - ${Boost_SYSTEM_LIBRARY}") - add_gudhi_cython_lib(${Boost_SYSTEM_LIBRARY}) + add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ") endif(CGAL_HEADER_ONLY) # GMP and GMPXX are not required, but if present, CGAL will link with them. @@ -157,12 +157,12 @@ if(CYTHON_FOUND) add_gudhi_debug_info("GMP_LIBRARIES = ${GMP_LIBRARIES}") set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_USE_GMP', ") message("##### add_gudhi_cython_lib GMP_LIBRARIES - ${GMP_LIBRARIES}") - add_gudhi_cython_lib(${GMP_LIBRARIES}) + add_gudhi_cython_lib("${GMP_LIBRARIES}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${GMP_LIBRARIES_DIR}', ") if(GMPXX_FOUND) add_gudhi_debug_info("GMPXX_LIBRARIES = ${GMPXX_LIBRARIES}") set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_USE_GMPXX', ") - add_gudhi_cython_lib(${GMPXX_LIBRARIES}) + add_gudhi_cython_lib("${GMPXX_LIBRARIES}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${GMPXX_LIBRARIES_DIR}', ") endif(GMPXX_FOUND) endif(GMP_FOUND) @@ -184,8 +184,8 @@ if(CYTHON_FOUND) if (TBB_FOUND AND WITH_GUDHI_USE_TBB) add_gudhi_debug_info("TBB version ${TBB_INTERFACE_VERSION} found and used") set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DGUDHI_USE_TBB', ") - add_gudhi_cython_lib(${TBB_RELEASE_LIBRARY}) - add_gudhi_cython_lib(${TBB_MALLOC_RELEASE_LIBRARY}) + add_gudhi_cython_lib("${TBB_RELEASE_LIBRARY}") + add_gudhi_cython_lib("${TBB_MALLOC_RELEASE_LIBRARY}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${TBB_LIBRARY_DIRS}', ") set(GUDHI_CYTHON_INCLUDE_DIRS "${GUDHI_CYTHON_INCLUDE_DIRS}'${TBB_INCLUDE_DIRS}', ") endif() -- cgit v1.2.3 From 2ffe7a5477803025b3de2abf59725d8dc2588f73 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Fri, 31 Aug 2018 11:38:56 +0000 Subject: Try with boost release and debug lib versions git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/windows_cgal_non_header_only_compilation_issue@3856 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 130a4319577ef0ec8c10a87c98b7ffcf6f16d808 --- src/cython/CMakeLists.txt | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index f9eccaa3..fb613639 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -132,8 +132,14 @@ if(CYTHON_FOUND) if(CGAL_FOUND) can_cgal_use_cxx11_thread_local() if (NOT CGAL_CAN_USE_CXX11_THREAD_LOCAL_RESULT) - message("##### add_gudhi_cython_lib Boost_THREAD_LIBRARY - ${Boost_THREAD_LIBRARY}") - add_gudhi_cython_lib("${Boost_THREAD_LIBRARY}") + message("##### Boost_THREAD_LIBRARY - ${Boost_THREAD_LIBRARY}") + if(CMAKE_BUILD_TYPE MATCHES Debug) + message("##### Boost_THREAD_LIBRARY_DEBUG - ${Boost_THREAD_LIBRARY_DEBUG}") + add_gudhi_cython_lib("${Boost_THREAD_LIBRARY_DEBUG}") + else() + message("##### Boost_THREAD_LIBRARY_RELEASE - ${Boost_THREAD_LIBRARY_RELEASE}") + add_gudhi_cython_lib("${Boost_THREAD_LIBRARY_RELEASE}") + endif() set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ") endif() # Add CGAL compilation args @@ -142,14 +148,20 @@ if(CYTHON_FOUND) set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_HEADER_ONLY', ") else(CGAL_HEADER_ONLY) add_gudhi_debug_info("CGAL version ${CGAL_VERSION}") - message("##### add_gudhi_cython_lib CGAL_LIBRARIES - ${CGAL_LIBRARIES}") + message("##### CGAL_LIBRARIES - ${CGAL_LIBRARIES}") add_gudhi_cython_lib("${CGAL_LIBRARIES}") - message("##### add_gudhi_cython_lib CGAL_LIBRARY - ${CGAL_LIBRARY}") + message("##### CGAL_LIBRARY - ${CGAL_LIBRARY}") add_gudhi_cython_lib("${CGAL_LIBRARY}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${CGAL_LIBRARIES_DIR}', ") # If CGAL is not header only, CGAL library may link with boost system, - message("##### add_gudhi_cython_lib Boost_SYSTEM_LIBRARY - ${Boost_SYSTEM_LIBRARY}") - add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY}") + message("##### Boost_SYSTEM_LIBRARY - ${Boost_SYSTEM_LIBRARY}") + if(CMAKE_BUILD_TYPE MATCHES Debug) + message("##### Boost_SYSTEM_LIBRARY_DEBUG - ${Boost_SYSTEM_LIBRARY_DEBUG}") + add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY_DEBUG}") + else() + message("##### Boost_SYSTEM_LIBRARY_RELEASE - ${Boost_SYSTEM_LIBRARY_RELEASE}") + add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY_RELEASE}") + endif() set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ") endif(CGAL_HEADER_ONLY) # GMP and GMPXX are not required, but if present, CGAL will link with them. -- cgit v1.2.3 From c5b865f6e9e1ae60de2720c76aee1dfccf470023 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Fri, 31 Aug 2018 11:59:31 +0000 Subject: Works fine in debug and release mode git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/windows_cgal_non_header_only_compilation_issue@3857 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 2cc11e2a6e7f8eed6c234c17cad7ff04efdbc659 --- src/cython/CMakeLists.txt | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index fb613639..90a2fcf7 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -1,9 +1,7 @@ project(Cython) function( add_gudhi_cython_lib THE_LIB ) - message("##### add_gudhi_cython_lib on ${THE_LIB}") if(EXISTS ${THE_LIB}) - message("##### EXISTS") get_filename_component(THE_LIB_FILE_NAME ${THE_LIB} NAME_WE) if(WIN32) message("++ ${THE_LIB} => THE_LIB_FILE_NAME = ${THE_LIB_FILE_NAME}") @@ -132,12 +130,9 @@ if(CYTHON_FOUND) if(CGAL_FOUND) can_cgal_use_cxx11_thread_local() if (NOT CGAL_CAN_USE_CXX11_THREAD_LOCAL_RESULT) - message("##### Boost_THREAD_LIBRARY - ${Boost_THREAD_LIBRARY}") if(CMAKE_BUILD_TYPE MATCHES Debug) - message("##### Boost_THREAD_LIBRARY_DEBUG - ${Boost_THREAD_LIBRARY_DEBUG}") add_gudhi_cython_lib("${Boost_THREAD_LIBRARY_DEBUG}") else() - message("##### Boost_THREAD_LIBRARY_RELEASE - ${Boost_THREAD_LIBRARY_RELEASE}") add_gudhi_cython_lib("${Boost_THREAD_LIBRARY_RELEASE}") endif() set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ") @@ -148,18 +143,13 @@ if(CYTHON_FOUND) set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_HEADER_ONLY', ") else(CGAL_HEADER_ONLY) add_gudhi_debug_info("CGAL version ${CGAL_VERSION}") - message("##### CGAL_LIBRARIES - ${CGAL_LIBRARIES}") add_gudhi_cython_lib("${CGAL_LIBRARIES}") - message("##### CGAL_LIBRARY - ${CGAL_LIBRARY}") add_gudhi_cython_lib("${CGAL_LIBRARY}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${CGAL_LIBRARIES_DIR}', ") # If CGAL is not header only, CGAL library may link with boost system, - message("##### Boost_SYSTEM_LIBRARY - ${Boost_SYSTEM_LIBRARY}") if(CMAKE_BUILD_TYPE MATCHES Debug) - message("##### Boost_SYSTEM_LIBRARY_DEBUG - ${Boost_SYSTEM_LIBRARY_DEBUG}") add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY_DEBUG}") else() - message("##### Boost_SYSTEM_LIBRARY_RELEASE - ${Boost_SYSTEM_LIBRARY_RELEASE}") add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY_RELEASE}") endif() set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ") @@ -168,7 +158,6 @@ if(CYTHON_FOUND) if(GMP_FOUND) add_gudhi_debug_info("GMP_LIBRARIES = ${GMP_LIBRARIES}") set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_USE_GMP', ") - message("##### add_gudhi_cython_lib GMP_LIBRARIES - ${GMP_LIBRARIES}") add_gudhi_cython_lib("${GMP_LIBRARIES}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${GMP_LIBRARIES_DIR}', ") if(GMPXX_FOUND) -- cgit v1.2.3 From e04a65661ab47399fe08f0d02597a0715630219d Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Fri, 31 Aug 2018 12:06:53 +0000 Subject: GUDHI release 2.3.0 candidate 3 git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3859 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: 42d7dda810e3a2f6d0d38c15f3a8ff6f86670d51 --- CMakeGUDHIVersion.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index a8317278..3ddc907a 100644 --- a/CMakeGUDHIVersion.txt +++ b/CMakeGUDHIVersion.txt @@ -1,6 +1,6 @@ set (GUDHI_MAJOR_VERSION 2) set (GUDHI_MINOR_VERSION 3) -set (GUDHI_PATCH_VERSION 0.rc2) +set (GUDHI_PATCH_VERSION 0.rc3) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") -- cgit v1.2.3 From 6a52e22654a677f087267226366de02ab7bb7527 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Fri, 31 Aug 2018 12:24:55 +0000 Subject: Add script to automize gudhi version creation git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3860 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: fc01077dc2120e5c5ad2190a5f0444859ecee426 --- scripts/create_gudhi_version.sh | 59 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100755 scripts/create_gudhi_version.sh diff --git a/scripts/create_gudhi_version.sh b/scripts/create_gudhi_version.sh new file mode 100755 index 00000000..0b393980 --- /dev/null +++ b/scripts/create_gudhi_version.sh @@ -0,0 +1,59 @@ +#!/bin/bash + +login="vrouvrea" +version="2.3.0.rc3" +cgaldir="/home/vincent/workspace/CGAL-4.11-HO/build" +cpucount=7 + + +# We start from scripts dir in the dev branch +cd .. +RELATIVEURL=`svn info . |grep -F "Relative URL:" | awk '{print $NF}'` + +if [ "$RELATIVEURL" != "^/trunk" ] +then +echo "Script must be launched in trunk and not in $RELATIVEURL" +exit +fi + +rm -rf build; mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=Debug -DDEBUG_TRACES=ON -DCGAL_DIR=${cgaldir} -DWITH_GUDHI_EXAMPLE=ON -DWITH_GUDHI_BENCHMARK=ON -DPython_ADDITIONAL_VERSIONS=3 .. +cmake -DCMAKE_BUILD_TYPE=Debug . + +make -j ${cpucount} all test + +cd .. +svn st | grep -v GUDHIVersion.cmake | grep "^\?" | awk "{print \$2}" | xargs rm -rf + +svn copy svn+ssh://${login}@scm.gforge.inria.fr/svnroot/gudhi/trunk svn+ssh://${login}@scm.gforge.inria.fr/svnroot/gudhi/tags/gudhi-release-${version} \ + -m "Creating a tag of Gudhi release version ${version}." + +cd build +make user_version + +userversiondir=`find . -type d -name "*_GUDHI_${version}" | sed 's/\.\///g'` +echo "User version directory = ${userversiondir}" + +tar -czvf ${userversiondir}.tar.gz ${userversiondir} + +userdocdir=${userversiondir/GUDHI/GUDHI_DOC} +echo "User documentation directory = ${userdocdir}" +mkdir ${userdocdir} +make doxygen + +cp -R ${userversiondir}/doc/html ${userdocdir}/cpp +cd ${userversiondir} +rm -rf build; mkdir build; cd build; cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=./installed -DCGAL_DIR=${cgaldir} -DWITH_GUDHI_EXAMPLE=ON -DPython_ADDITIONAL_VERSIONS=3 .. +make sphinx + +cp -R cython/sphinx ../../${userdocdir}/python +cd ../.. +tar -czvf ${userdocdir}.tar.gz ${userdocdir} + +cd ${userversiondir}/build +make -j ${cpucount} all test install + +cd ../.. +actualdir=`pwd` +echo "Library is available at ${actualdir}/${userversiondir}.tar.gz" +sha256sum ${userversiondir}.tar.gz +echo "Documentation is available at ${actualdir}/${userdocdir}.tar.gz" -- cgit v1.2.3 From ec9100908202bb5b7a6ba835edeabf3272d70e98 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Fri, 31 Aug 2018 12:38:13 +0000 Subject: Link with release third parties library version, even in debug mode git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3863 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: e33e15081b3029d9dfd4edc464d91b0db47e1754 --- src/cython/CMakeLists.txt | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index 90a2fcf7..cf57d872 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -130,11 +130,7 @@ if(CYTHON_FOUND) if(CGAL_FOUND) can_cgal_use_cxx11_thread_local() if (NOT CGAL_CAN_USE_CXX11_THREAD_LOCAL_RESULT) - if(CMAKE_BUILD_TYPE MATCHES Debug) - add_gudhi_cython_lib("${Boost_THREAD_LIBRARY_DEBUG}") - else() - add_gudhi_cython_lib("${Boost_THREAD_LIBRARY_RELEASE}") - endif() + add_gudhi_cython_lib("${Boost_THREAD_LIBRARY_RELEASE}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ") endif() # Add CGAL compilation args @@ -143,15 +139,10 @@ if(CYTHON_FOUND) set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DCGAL_HEADER_ONLY', ") else(CGAL_HEADER_ONLY) add_gudhi_debug_info("CGAL version ${CGAL_VERSION}") - add_gudhi_cython_lib("${CGAL_LIBRARIES}") add_gudhi_cython_lib("${CGAL_LIBRARY}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${CGAL_LIBRARIES_DIR}', ") # If CGAL is not header only, CGAL library may link with boost system, - if(CMAKE_BUILD_TYPE MATCHES Debug) - add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY_DEBUG}") - else() - add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY_RELEASE}") - endif() + add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY_RELEASE}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ") endif(CGAL_HEADER_ONLY) # GMP and GMPXX are not required, but if present, CGAL will link with them. -- cgit v1.2.3 From fa19484e31dbe0b63d50475f15e654a5e1a0c4e1 Mon Sep 17 00:00:00 2001 From: vrouvrea Date: Tue, 4 Sep 2018 09:34:24 +0000 Subject: Use debug or release version to link with python package git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/trunk@3871 636b058d-ea47-450e-bf9e-a15bfbe3eedb Former-commit-id: afbd5c833ddc3a525d7091ab186714825109eb87 --- CMakeGUDHIVersion.txt | 2 +- src/cython/CMakeLists.txt | 21 +++++++++++++++++---- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/CMakeGUDHIVersion.txt b/CMakeGUDHIVersion.txt index 3ddc907a..ebaddd47 100644 --- a/CMakeGUDHIVersion.txt +++ b/CMakeGUDHIVersion.txt @@ -1,6 +1,6 @@ set (GUDHI_MAJOR_VERSION 2) set (GUDHI_MINOR_VERSION 3) -set (GUDHI_PATCH_VERSION 0.rc3) +set (GUDHI_PATCH_VERSION 0) set(GUDHI_VERSION ${GUDHI_MAJOR_VERSION}.${GUDHI_MINOR_VERSION}.${GUDHI_PATCH_VERSION}) message(STATUS "GUDHI version : ${GUDHI_VERSION}") diff --git a/src/cython/CMakeLists.txt b/src/cython/CMakeLists.txt index cf57d872..09ea28f1 100644 --- a/src/cython/CMakeLists.txt +++ b/src/cython/CMakeLists.txt @@ -130,7 +130,11 @@ if(CYTHON_FOUND) if(CGAL_FOUND) can_cgal_use_cxx11_thread_local() if (NOT CGAL_CAN_USE_CXX11_THREAD_LOCAL_RESULT) - add_gudhi_cython_lib("${Boost_THREAD_LIBRARY_RELEASE}") + if(CMAKE_BUILD_TYPE MATCHES Debug) + add_gudhi_cython_lib("${Boost_THREAD_LIBRARY_DEBUG}") + else() + add_gudhi_cython_lib("${Boost_THREAD_LIBRARY_RELEASE}") + endif() set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ") endif() # Add CGAL compilation args @@ -142,7 +146,11 @@ if(CYTHON_FOUND) add_gudhi_cython_lib("${CGAL_LIBRARY}") set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${CGAL_LIBRARIES_DIR}', ") # If CGAL is not header only, CGAL library may link with boost system, - add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY_RELEASE}") + if(CMAKE_BUILD_TYPE MATCHES Debug) + add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY_DEBUG}") + else() + add_gudhi_cython_lib("${Boost_SYSTEM_LIBRARY_RELEASE}") + endif() set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${Boost_LIBRARY_DIRS}', ") endif(CGAL_HEADER_ONLY) # GMP and GMPXX are not required, but if present, CGAL will link with them. @@ -176,8 +184,13 @@ if(CYTHON_FOUND) if (TBB_FOUND AND WITH_GUDHI_USE_TBB) add_gudhi_debug_info("TBB version ${TBB_INTERFACE_VERSION} found and used") set(GUDHI_CYTHON_EXTRA_COMPILE_ARGS "${GUDHI_CYTHON_EXTRA_COMPILE_ARGS}'-DGUDHI_USE_TBB', ") - add_gudhi_cython_lib("${TBB_RELEASE_LIBRARY}") - add_gudhi_cython_lib("${TBB_MALLOC_RELEASE_LIBRARY}") + if(CMAKE_BUILD_TYPE MATCHES Debug) + add_gudhi_cython_lib("${TBB_DEBUG_LIBRARY}") + add_gudhi_cython_lib("${TBB_MALLOC_DEBUG_LIBRARY}") + else() + add_gudhi_cython_lib("${TBB_RELEASE_LIBRARY}") + add_gudhi_cython_lib("${TBB_MALLOC_RELEASE_LIBRARY}") + endif() set(GUDHI_CYTHON_LIBRARY_DIRS "${GUDHI_CYTHON_LIBRARY_DIRS}'${TBB_LIBRARY_DIRS}', ") set(GUDHI_CYTHON_INCLUDE_DIRS "${GUDHI_CYTHON_INCLUDE_DIRS}'${TBB_INCLUDE_DIRS}', ") endif() -- cgit v1.2.3