From 0ddedab9c6185028661dcaaac9f6fbca4c9e93fc Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 12 Jun 2011 18:27:29 +0000 Subject: work in progress cmake commit: - cmake now builds all files that automake does but does NOT link yet - inlcudes nasty hard coded paths and libs (will replace once linking works) (bzr r10272) --- src/libavoid/CMakeLists.txt | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) (limited to 'src/libavoid') diff --git a/src/libavoid/CMakeLists.txt b/src/libavoid/CMakeLists.txt index 3f408074c..b76cf1d39 100644 --- a/src/libavoid/CMakeLists.txt +++ b/src/libavoid/CMakeLists.txt @@ -1,19 +1,18 @@ -SET(libavoid_SRC -connector.cpp -geometry.cpp -graph.cpp -makepath.cpp -polyutil.cpp -region.cpp -router.cpp -shape.cpp -static.cpp -timer.cpp -vertices.cpp -visibility.cpp -orthogonal.cpp -vpsc.cpp +set(libavoid_SRC + connector.cpp + geometry.cpp + geomtypes.cpp + graph.cpp + makepath.cpp + orthogonal.cpp + router.cpp + shape.cpp + timer.cpp + vertices.cpp + viscluster.cpp + visibility.cpp + vpsc.cpp ) -ADD_LIBRARY(avoid STATIC ${libavoid_SRC}) -TARGET_LINK_LIBRARIES(avoid -${INKSCAPE_LIBS}) \ No newline at end of file + +add_library(avoid STATIC ${libavoid_SRC}) +target_link_libraries(avoid ${INKSCAPE_LIBS}) \ No newline at end of file -- cgit v1.2.3 From de03354959190a2c5392d79e03dd22dc45777e41 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 12 Jun 2011 21:27:00 +0000 Subject: cmake: give all libs a _LIB suffix, workaround 'debug' being confused with cake keyword, and also dont mix up dor names with libs. (bzr r10274) --- src/libavoid/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libavoid') diff --git a/src/libavoid/CMakeLists.txt b/src/libavoid/CMakeLists.txt index b76cf1d39..6eb6bdd1d 100644 --- a/src/libavoid/CMakeLists.txt +++ b/src/libavoid/CMakeLists.txt @@ -14,5 +14,5 @@ set(libavoid_SRC vpsc.cpp ) -add_library(avoid STATIC ${libavoid_SRC}) -target_link_libraries(avoid ${INKSCAPE_LIBS}) \ No newline at end of file +add_library(avoid_LIB STATIC ${libavoid_SRC}) +target_link_libraries(avoid_LIB ${INKSCAPE_LIBS}) -- cgit v1.2.3 From 7172735786c43c2305a92ffd4e5d285d11f88f7f Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 13 Jun 2011 00:19:17 +0000 Subject: cmake: turns out my recent commits (which I undid) were not incorrect, variables were set in subdirectories then used in the parent directory, where they were still unset. Fixing this broke the build because some files in the subdir were not compiling. (bzr r10276) --- src/libavoid/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/libavoid') diff --git a/src/libavoid/CMakeLists.txt b/src/libavoid/CMakeLists.txt index 6eb6bdd1d..04b7375b1 100644 --- a/src/libavoid/CMakeLists.txt +++ b/src/libavoid/CMakeLists.txt @@ -1,3 +1,4 @@ + set(libavoid_SRC connector.cpp geometry.cpp @@ -14,5 +15,4 @@ set(libavoid_SRC vpsc.cpp ) -add_library(avoid_LIB STATIC ${libavoid_SRC}) -target_link_libraries(avoid_LIB ${INKSCAPE_LIBS}) +add_library(avoid_LIB ${libavoid_SRC}) -- cgit v1.2.3 From b7a4f23ed217a36eaaefe8f707bcc1b968d1e562 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 13 Jun 2011 05:39:42 +0000 Subject: cmake: - group source/headers per library (for some IDE's) - include headers with source listing (also for IDE's) - remove unneeded Find modules (bzr r10281) --- src/libavoid/CMakeLists.txt | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) (limited to 'src/libavoid') diff --git a/src/libavoid/CMakeLists.txt b/src/libavoid/CMakeLists.txt index 04b7375b1..de067833b 100644 --- a/src/libavoid/CMakeLists.txt +++ b/src/libavoid/CMakeLists.txt @@ -13,6 +13,25 @@ set(libavoid_SRC viscluster.cpp visibility.cpp vpsc.cpp + + # ------- + # Headers + assertions.h + connector.h + debug.h + geometry.h + geomtypes.h + graph.h + libavoid.h + makepath.h + orthogonal.h + router.h + shape.h + timer.h + vertices.h + viscluster.h + visibility.h + vpsc.h ) -add_library(avoid_LIB ${libavoid_SRC}) +add_inkscape_lib(avoid_LIB "${libavoid_SRC}") -- cgit v1.2.3 From d8f262a5fba55b24449ffa312bdcda3623e10ac8 Mon Sep 17 00:00:00 2001 From: Josh Andler Date: Tue, 14 Jun 2011 10:58:01 -0700 Subject: patch for 771738, 635469, 700298, 705382, 716057 by Gellule (bzr r10301) --- src/libavoid/orthogonal.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libavoid') diff --git a/src/libavoid/orthogonal.cpp b/src/libavoid/orthogonal.cpp index 4a7b0af2d..e0a30b246 100644 --- a/src/libavoid/orthogonal.cpp +++ b/src/libavoid/orthogonal.cpp @@ -1731,7 +1731,7 @@ static void buildOrthogonalChannelInfo(Router *router, Polygon& displayRoute = (*curr)->displayRoute(); // Determine all line segments that we are interested in shifting. // We don't consider the first or last segment of a path. - for (size_t i = 1; i < displayRoute.size(); ++i) + for (size_t i = 1; i < displayRoute.size()-1; ++i) { if (displayRoute.ps[i - 1][dim] == displayRoute.ps[i][dim]) { -- cgit v1.2.3 From dcf765f3dcbff2e65428e0f002bb5ea3648940f0 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 25 Jun 2011 15:35:01 +0000 Subject: warning cleanup (no functional changes) - enclose && / || with brackets to avoid ambiguity. - don't cast from booleans to pointers. (bzr r10359) --- src/libavoid/vpsc.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libavoid') diff --git a/src/libavoid/vpsc.cpp b/src/libavoid/vpsc.cpp index 19d360375..1646ddaaa 100644 --- a/src/libavoid/vpsc.cpp +++ b/src/libavoid/vpsc.cpp @@ -422,7 +422,7 @@ Constraint* IncSolver::mostViolated(Constraints &l) { // downwards. There is always at least 1 element in the // vector because of search. // TODO check this logic and add parens: - if((deletePoint != end) && ((minSlack < ZERO_UPPERBOUND) && !v->active || v->equality)) { + if((deletePoint != end) && (((minSlack < ZERO_UPPERBOUND) && !v->active) || v->equality)) { *deletePoint = l[l.size()-1]; l.resize(l.size()-1); } -- cgit v1.2.3 From 7cd2a14069d9d39b42b19a87d9cc6ba238c71924 Mon Sep 17 00:00:00 2001 From: "Jon A. Cruz" Date: Sun, 23 Oct 2011 01:01:33 -0700 Subject: Documentation update pass. (bzr r10692) --- src/libavoid/vpsc.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/libavoid') diff --git a/src/libavoid/vpsc.h b/src/libavoid/vpsc.h index 4d6d8ce61..da837c1f8 100644 --- a/src/libavoid/vpsc.h +++ b/src/libavoid/vpsc.h @@ -181,10 +181,13 @@ public: const bool equality; bool unsatisfiable; }; -/* + +/** * A block structure defined over the variables such that each block contains * 1 or more variables, with the invariant that all constraints inside a block - * are satisfied by keeping the variables fixed relative to one another + * are satisfied by keeping the variables fixed relative to one another. + * + * @todo check on this class being copy-n-paste duplicated. */ class Blocks : public std::set { -- cgit v1.2.3