Shared library fix (#247)

* Fixes for #243 as per discussion * Move files as per #243 discussion * Fix include paths in Examples * * Replace relative include paths in examples * Disable unused-(function|result) warning for gcc targets * Fix some indentation in CMakeLists.txt * - Add pkgconfig - Fix test in CMakeLists.txt for actual gcc use
AngusJohnson · Oct 1, 2022 · acfeee6 · acfeee6
1 parent c9de2eb
commit acfeee6
Show file tree

Hide file tree

Showing 28 changed files with 68 additions and 45 deletions.
diff --git a/CPP/CMakeLists.txt b/CPP/CMakeLists.txt
@@ -15,32 +15,34 @@ option(BUILD_SHARED_LIBS "Build shared libs" OFF)
 include(GNUInstallDirs)
 
 set(CLIPPER2_INC
-  Clipper2Lib/clipper.core.h
-  Clipper2Lib/clipper.engine.h
-  Clipper2Lib/clipper.h
-  Clipper2Lib/clipper.minkowski.h
-  Clipper2Lib/clipper.offset.h
+  Clipper2Lib/include/clipper2/clipper.core.h
+  Clipper2Lib/include/clipper2/clipper.engine.h
+  Clipper2Lib/include/clipper2/clipper.h
+  Clipper2Lib/include/clipper2/clipper.minkowski.h
+  Clipper2Lib/include/clipper2/clipper.offset.h
 )
 
 set(CLIPPER2_SRC
-  Clipper2Lib/clipper.engine.cpp
-  Clipper2Lib/clipper.offset.cpp
+  Clipper2Lib/src/clipper.engine.cpp
+  Clipper2Lib/src/clipper.offset.cpp
 )
 
+set(PCFILE "${CMAKE_CURRENT_BINARY_DIR}/Clipper2.pc")
+
 # 2d version of Clipper2
-add_library(Clipper2 ${CLIPPER2_SRC})
+add_library(Clipper2 ${CLIPPER2_INC} ${CLIPPER2_SRC})
 
 target_include_directories(Clipper2
-  PUBLIC Clipper2Lib
+  PUBLIC Clipper2Lib/include
 )
 
 # Clipper2 but with USINGZ defined
-add_library(Clipper2Z ${CLIPPER2_SRC})
+add_library(Clipper2Z ${CLIPPER2_INC} ${CLIPPER2_SRC})
 
 target_compile_definitions(Clipper2Z PUBLIC USINGZ)
 
 target_include_directories(Clipper2Z
-  PUBLIC Clipper2Lib
+  PUBLIC Clipper2Lib/include
 )
 
 if (WIN32)
@@ -72,25 +74,25 @@ if(CLIPPER2_UTILS OR CLIPPER2_TESTS OR CLIPPER2_EXAMPLES)
     Utils/ClipFileSave.cpp
   )
 
-  add_library(Clipper2utils STATIC ${CLIPPER2_UTILS_SRC})
+  add_library(Clipper2utils STATIC ${CLIPPER2_UTILS_INC} ${CLIPPER2_UTILS_SRC})
 
   target_link_libraries(Clipper2utils PUBLIC Clipper2)
   target_include_directories(Clipper2utils
     PUBLIC Utils
   )
 
-  add_library(Clipper2Zutils STATIC ${CLIPPER2_UTILS_SRC})
+  add_library(Clipper2Zutils STATIC ${CLIPPER2_UTILS_INC} ${CLIPPER2_UTILS_SRC})
 
   target_link_libraries(Clipper2Zutils PUBLIC Clipper2Z)
   target_include_directories(Clipper2Zutils
     PUBLIC Utils
   )
 
   set_target_properties(Clipper2utils Clipper2Zutils PROPERTIES FOLDER Libraries)
-if (NOT WIN32)
-  target_compile_options(Clipper2utils PRIVATE -Wno-unused-variable -Wno-unused-function)
-  target_compile_options(Clipper2Zutils PRIVATE -Wno-unused-variable -Wno-unused-function)
-endif()
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    target_compile_options(Clipper2utils PRIVATE -Wno-unused-variable -Wno-unused-function)
+    target_compile_options(Clipper2Zutils PRIVATE -Wno-unused-variable -Wno-unused-function)
+  endif()
 endif()
 
 if(CLIPPER2_EXAMPLES)
@@ -112,6 +114,12 @@ if(CLIPPER2_EXAMPLES)
   target_link_libraries(UsingZ1 PRIVATE Clipper2Z Clipper2Zutils)
 
   set_target_properties(ConsoleDemo1 ConsoleDemo2 InflateDemo1 UsingZ1 PROPERTIES FOLDER Examples)
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    target_compile_options(ConsoleDemo1 PRIVATE -Wno-unused-result -Wno-unused-function)
+    target_compile_options(ConsoleDemo2 PRIVATE -Wno-unused-result -Wno-unused-function)
+    target_compile_options(InflateDemo1 PRIVATE -Wno-unused-result -Wno-unused-function)
+    target_compile_options(UsingZ1 PRIVATE -Wno-unused-result -Wno-unused-function)
+  endif()
 endif()
 
 
@@ -146,10 +154,10 @@ if(CLIPPER2_TESTS)
   add_executable(ClipperTestsZ ${ClipperTests_SRC})
   target_link_libraries(ClipperTestsZ gtest gtest_main Clipper2Z Clipper2Zutils)
 
-if (NOT WIN32)
-  target_compile_options(ClipperTests PRIVATE -Wno-unused-variable -Wno-unused-function)
-  target_compile_options(ClipperTestsZ PRIVATE -Wno-unused-variable -Wno-unused-function)
-endif()
+  if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+    target_compile_options(ClipperTests PRIVATE -Wno-unused-variable -Wno-unused-function)
+    target_compile_options(ClipperTestsZ PRIVATE -Wno-unused-variable -Wno-unused-function)
+  endif()
 
   set_target_properties(ClipperTests ClipperTestsZ PROPERTIES FOLDER Tests)
 
@@ -172,6 +180,9 @@ endif()
   file(COPY ../Tests/Polygons.txt DESTINATION ${CMAKE_BINARY_DIR} FILE_PERMISSIONS OWNER_READ GROUP_READ WORLD_READ )
 endif()
 
+CONFIGURE_FILE(Clipper2.pc.cmakein "${PCFILE}" @ONLY)
+
 install(TARGETS Clipper2 Clipper2Z
         PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/clipper2
 )
+install(FILES ${PCFILE} DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkconfig)
diff --git a/CPP/Clipper2.pc.cmakein b/CPP/Clipper2.pc.cmakein
@@ -0,0 +1,12 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+
+Name: Clipper2
+Description: A Polygon Clipping and Offsetting library in C++
+Version: @PROJECT_VERSION@
+URL: https://github.com/AngusJohnson/Clipper2
+Requires:
+Libs: -L${libdir} -lClipper2
+Cflags: -I${includedir}
diff --git a/CPP/Clipper2Lib/clipper.core.h → ...ipper2Lib/include/clipper2/clipper.core.h b/CPP/Clipper2Lib/clipper.core.h → ...ipper2Lib/include/clipper2/clipper.core.h
diff --git a/CPP/Clipper2Lib/clipper.engine.h → ...per2Lib/include/clipper2/clipper.engine.h b/CPP/Clipper2Lib/clipper.engine.h → ...per2Lib/include/clipper2/clipper.engine.h
diff --git a/CPP/Clipper2Lib/clipper.h → CPP/Clipper2Lib/include/clipper2/clipper.h b/CPP/Clipper2Lib/clipper.h → CPP/Clipper2Lib/include/clipper2/clipper.h
diff --git a/CPP/Clipper2Lib/clipper.minkowski.h → ...2Lib/include/clipper2/clipper.minkowski.h b/CPP/Clipper2Lib/clipper.minkowski.h → ...2Lib/include/clipper2/clipper.minkowski.h
diff --git a/CPP/Clipper2Lib/clipper.offset.h → ...per2Lib/include/clipper2/clipper.offset.h b/CPP/Clipper2Lib/clipper.offset.h → ...per2Lib/include/clipper2/clipper.offset.h
diff --git a/CPP/Clipper2Lib/clipper.engine.cpp → CPP/Clipper2Lib/src/clipper.engine.cpp b/CPP/Clipper2Lib/clipper.engine.cpp → CPP/Clipper2Lib/src/clipper.engine.cpp
@@ -14,7 +14,7 @@
 #include <vector>
 #include <numeric>
 #include <algorithm>
-#include "clipper.engine.h"
+#include "clipper2/clipper.engine.h"
 
 namespace Clipper2Lib {
 

diff --git a/CPP/Clipper2Lib/clipper.offset.cpp → CPP/Clipper2Lib/src/clipper.offset.cpp b/CPP/Clipper2Lib/clipper.offset.cpp → CPP/Clipper2Lib/src/clipper.offset.cpp
@@ -9,8 +9,8 @@
 *******************************************************************************/
 
 #include <cmath>
-#include "clipper.h"
-#include "clipper.offset.h"
+#include "clipper2/clipper.h"
+#include "clipper2/clipper.offset.h"
 
 namespace Clipper2Lib {
 

diff --git a/CPP/Examples/ConsoleDemo1/ConsoleDemo1.cpp b/CPP/Examples/ConsoleDemo1/ConsoleDemo1.cpp
@@ -2,7 +2,7 @@
 #include <string>
 #include <chrono> 
 
-#include "../../Clipper2Lib/clipper.h"
+#include "clipper2/clipper.h"
 #include "../../Utils/clipper.svg.utils.h"
 #include "../../Utils/ClipFileLoad.h"
 #include "../../Utils/ClipFileSave.h"

diff --git a/CPP/Examples/ConsoleDemo2/ConsoleDemo2.cpp b/CPP/Examples/ConsoleDemo2/ConsoleDemo2.cpp
@@ -2,7 +2,7 @@
 #include <string>
 #include <chrono> 
 
-#include "../../Clipper2Lib/clipper.h"
+#include "clipper2/clipper.h"
 #include "../../Utils/clipper.svg.utils.h"
 #include "../../Utils/ClipFileLoad.h"
 #include "../../Utils/ClipFileSave.h"

diff --git a/CPP/Examples/InflateDemo/InflateDemo1.cpp b/CPP/Examples/InflateDemo/InflateDemo1.cpp
@@ -1,6 +1,6 @@
 
 #include <cstdlib>
-#include "../../Clipper2Lib/clipper.h"
+#include "clipper2/clipper.h"
 #include "../../Utils/clipper.svg.h"
 #include "../../Utils/clipper.svg.utils.h"
 #include "../../Utils/Timer.h"

diff --git a/CPP/Examples/UsingZ/UsingZ1.cpp b/CPP/Examples/UsingZ/UsingZ1.cpp
@@ -1,6 +1,6 @@
 
 #include <cstdlib>
-#include "../../Clipper2Lib/clipper.h"
+#include "clipper2/clipper.h"
 #include "../../Utils/clipper.svg.h"
 #include "../../Utils/clipper.svg.utils.h"
 

diff --git a/CPP/Tests/TestLines.cpp b/CPP/Tests/TestLines.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 #include "ClipFileLoad.h"
 
 TEST(Clipper2Tests, TestMultipleLines) {

diff --git a/CPP/Tests/TestOffsetOrientation.cpp b/CPP/Tests/TestOffsetOrientation.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "clipper.offset.h"
+#include "clipper2/clipper.offset.h"
 
 TEST(Clipper2Tests, TestOffsettingOrientation) {
     Clipper2Lib::ClipperOffset co;

diff --git a/CPP/Tests/TestOrientation.cpp b/CPP/Tests/TestOrientation.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 
 using namespace Clipper2Lib;
 

diff --git a/CPP/Tests/TestPolygons.cpp b/CPP/Tests/TestPolygons.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 #include "ClipFileLoad.h"
 
 inline Clipper2Lib::PathD MakeRandomPath(int width, int height, unsigned vertCnt)

diff --git a/CPP/Tests/TestPolytreeHoles1.cpp b/CPP/Tests/TestPolytreeHoles1.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 #include "ClipFileLoad.h"
 
 using namespace Clipper2Lib;

diff --git a/CPP/Tests/TestPolytreeHoles2.cpp b/CPP/Tests/TestPolytreeHoles2.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 #include "ClipFileLoad.h"
 
 using namespace Clipper2Lib;

diff --git a/CPP/Tests/TestPolytreeIntersection.cpp b/CPP/Tests/TestPolytreeIntersection.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 
 using namespace Clipper2Lib;
 

diff --git a/CPP/Tests/TestPolytreeUnion.cpp b/CPP/Tests/TestPolytreeUnion.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 
 using namespace Clipper2Lib;
 

diff --git a/CPP/Tests/TestRandomPaths.cpp b/CPP/Tests/TestRandomPaths.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 #include <fstream>
 #include <random>
 

diff --git a/CPP/Tests/TestTrimCollinear.cpp b/CPP/Tests/TestTrimCollinear.cpp
@@ -1,5 +1,5 @@
 #include <gtest/gtest.h>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 
 using namespace Clipper2Lib;
 

diff --git a/CPP/Utils/ClipFileLoad.h b/CPP/Utils/ClipFileLoad.h
@@ -7,7 +7,7 @@
 
 #include <fstream>
 #include <string>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 #ifndef _WIN32
 #include <sys/types.h>
 #include <sys/stat.h>

diff --git a/CPP/Utils/ClipFileSave.cpp b/CPP/Utils/ClipFileSave.cpp
@@ -64,7 +64,7 @@ class BMH_Search
   {
     while (current < end)
     {
-      uint8_t i = shift[(unsigned)*current];  //compare last byte first
+      uint8_t i = shift[static_cast<unsigned>(*current)];  //compare last byte first
       if (!i)                   //last byte matches if i == 0
       {
         char* j = current - needle_len_less1;
@@ -88,12 +88,12 @@ class BMH_Search
   {
     while (current < end)
     {
-      uint8_t i = shift[case_table[(unsigned)*current]];
+      uint8_t i = shift[case_table[static_cast<unsigned>(*current)]];
       if (!i)                          
       {
         char* j = current - needle_len_less1;
         while (i < needle_len_less1 &&
-          needle_ic_[i] == case_table[(unsigned)*(j + (unsigned)i)]) ++i;
+          needle_ic_[i] == case_table[static_cast<unsigned>(*(j + i))]) ++i;
         if (i == needle_len_less1)
         {
           ++current;

diff --git a/CPP/Utils/ClipFileSave.h b/CPP/Utils/ClipFileSave.h
@@ -5,7 +5,7 @@
 #ifndef CLIPPER_TEST_SAVE_H
 #define CLIPPER_TEST_SAVE_H
 
-#include "clipper.h"
+#include "clipper2/clipper.h"
 
 bool SaveTest(const std::string& filename, bool append,
   Clipper2Lib::Paths64* subj, Clipper2Lib::Paths64* subj_open, Clipper2Lib::Paths64* clip,

diff --git a/CPP/Utils/clipper.svg.h b/CPP/Utils/clipper.svg.h
@@ -11,7 +11,7 @@
 
 #include <cstdlib>
 #include <string>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 
 namespace Clipper2Lib {
 

diff --git a/CPP/Utils/clipper.svg.utils.h b/CPP/Utils/clipper.svg.utils.h
@@ -11,7 +11,7 @@
 
 #include <cstdlib>
 #include <string>
-#include "clipper.h"
+#include "clipper2/clipper.h"
 #include "clipper.svg.h"
 #ifndef _WIN32
 #include <sys/types.h>