star-cpr

commit d441cf29264ed042e7f47f7ba2b6b60dd7d9c27f
parent 27843184c227471e5f2b2c7a0d949e099eeae2e8
Author: Vincent Forest <vincent.forest@meos-star.com>
Date:   Tue, 18 Dec 2018 14:21:53 +0100

Merge branch 'release_0.1.2'

Diffstat:
M
README.md
 | 
5
+++++
M
cmake/CMakeLists.txt
 | 
2
+-
M
cmake/ClipperConfig.cmake
 | 
7
++++++-

3 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/README.md b/README.md
@@ -22,6 +22,11 @@ project from the `cmake/CMakeLists.txt` file by appending to the
 
 ## Release notes
 
+### Version 0.1.2
+
+- Update CMake module of the Clipper library: on GNU/Linux, make optional the
+  debug version of the library.
+
 ### Version 0.1.1
 
 - Update the version of the RSys dependency to 0.6: replace the deprecated
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
@@ -48,7 +48,7 @@ rcmake_append_runtime_dirs(_runtime_dirs RSys Polygon)
 ################################################################################
 set(VERSION_MAJOR 0)
 set(VERSION_MINOR 1)
-set(VERSION_PATCH 1)
+set(VERSION_PATCH 2)
 set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 
 set(SCPR_FILES_SRC scpr_mesh.c)
diff --git a/cmake/ClipperConfig.cmake b/cmake/ClipperConfig.cmake
@@ -1,4 +1,4 @@
-# Copyright (C) |Meso|Star> 2016 (contact@meso-star.com)
+# Copyright (C) |Meso|Star> 2016-2018 (contact@meso-star.com)
 #
 # This software is a computer program whose purpose is to generate files
 # used to build the Star-3D library.
@@ -53,7 +53,12 @@ if(CMAKE_HOST_WIN32)
   set(_property IMPORTED_IMPLIB)
 else(CMAKE_HOST_WIN32)
   set(_property IMPORTED_LOCATION)
+  if(NOT Clipper_LIBRARY_DEBUG) # Fallback lib
+    get_property(_doc CACHE Clipper_LIBRARY_DEBUG PROPERTY HELPSTRING)
+    set(Clipper_LIBRARY_DEBUG ${Clipper_LIBRARY} CACHE PATH ${_doc} FORCE)
+  endif(NOT Clipper_LIBRARY_DEBUG)
 endif(CMAKE_HOST_WIN32)
+
 add_library(Clipper SHARED IMPORTED)
 set_target_properties(Clipper PROPERTIES
   ${_property} ${Clipper_LIBRARY_DEBUG}