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.

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

Proposal to fix issue #3375 #3377

Merged
merged 4 commits into from
Oct 29, 2018

Conversation

Simon-Lopez
Copy link
Contributor

Release Management

@lrineau

This comment has been minimized.

@lrineau lrineau requested review from afabri and sloriot October 8, 2018 13:49
@lrineau lrineau self-assigned this Oct 8, 2018
@lrineau lrineau added this to the 4.14-beta milestone Oct 8, 2018
@afabri
Copy link
Member

afabri commented Oct 9, 2018

@Simon-Lopez I confirm the bug and your fix. Can you please make me collaborator so that I can push a commit with a testcase in your repo.
@lrineau this should be rebased to 4.12

@lrineau
Copy link
Member

lrineau commented Oct 9, 2018

Let me know once the branch is finished. If I rewrite the history while you are working on it, we will have troubles.

@afabri
Copy link
Member

afabri commented Oct 9, 2018

@lrineau you can go ahead.

@lrineau lrineau changed the base branch from master to releases/CGAL-4.12-branch October 10, 2018 08:46
@lrineau lrineau modified the milestones: 4.14-beta, 4.12.2 Oct 10, 2018
@lrineau
Copy link
Member

lrineau commented Oct 10, 2018

@afabri commented on Oct 9, 2018, 12:43 PM GMT+2:

@lrineau this should be rebased to 4.12

That's done, now.

Warning: you must now re-fetch Simon's repo, and then:

> git reset --hard 'Simon-Lopez/simon_cgal_#3375'

@lrineau
Copy link
Member

lrineau commented Oct 10, 2018

There is a CMake error detected by Travis:

-- Configuring test in test/Surface_mesh
-- Build type: 
-- USING CXXFLAGS = '-std=c++11 '
-- USING LDFLAGS = ' '
-- Code taken from Git branch: HEAD
CMake Error at Installation/cmake/modules/CGAL_CreateSingleSourceCGALProgram.cmake:49 (add_executable):
  add_executable cannot create target "sm_join" because another target with
  the same name already exists.  The existing target is an executable created
  in source directory
  "/home/travis/build/CGAL/cgal/Surface_mesh/examples/Surface_mesh".  See
  documentation for policy CMP0002 for more details.
Call Stack (most recent call first):
  Surface_mesh/test/Surface_mesh/CMakeLists.txt:22 (create_single_source_cgal_program)

The sm_join.cpp of this PR must be renamed.

Copy link
Member

@afabri afabri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I approve and added a testcase.

@lrineau
Copy link
Member

lrineau commented Oct 12, 2018

Travis says:

[ 50%] Building CXX object CMakeFiles/sm_join_test.dir/sm_join_test.cpp.o
/home/travis/build/CGAL/cgal/Surface_mesh/test/Surface_mesh/sm_join_test.cpp:22:29: error: 
      no member named 'vertex_freelist' in
      'CGAL::Surface_mesh<CGAL::Point_3<CGAL::Simple_cartesian<double> > >'
  vertex_descriptor vd = sm.vertex_freelist();
                         ~~ ^
/home/travis/build/CGAL/cgal/Surface_mesh/test/Surface_mesh/sm_join_test.cpp:32:27: error: 
      no member named 'face_freelist' in
      'CGAL::Surface_mesh<CGAL::Point_3<CGAL::Simple_cartesian<double> > >'
  face_descriptor fd = sm.face_freelist();
                       ~~ ^
/home/travis/build/CGAL/cgal/Surface_mesh/test/Surface_mesh/sm_join_test.cpp:42:27: error: 
      no member named 'edge_freelist' in
      'CGAL::Surface_mesh<CGAL::Point_3<CGAL::Simple_cartesian<double> > >'
  edge_descriptor ed = sm.edge_freelist();
                       ~~ ^
3 errors generated.

https://travis-ci.org/CGAL/cgal/jobs/439638443#L2100

@lrineau lrineau added rm only: ready for master For the release team only: that indicates that a PR is about to be merged in 'master' Tested rm only: ready for release branch For the release team only: that indicates that a PR is about to be merged in a release branch labels Oct 29, 2018
@lrineau lrineau merged commit 0dc1cf2 into CGAL:releases/CGAL-4.12-branch Oct 29, 2018
lrineau added a commit that referenced this pull request Oct 29, 2018
lrineau added a commit that referenced this pull request Oct 29, 2018
@lrineau lrineau removed rm only: ready for release branch For the release team only: that indicates that a PR is about to be merged in a release branch labels Oct 29, 2018
lrineau added a commit that referenced this pull request Oct 29, 2018
@lrineau
Copy link
Member

lrineau commented Oct 29, 2018

Successfully tested in CGAL-4.14-Ic-27, and then merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants