From 81a073fc86743a89a01e56a2178a6cbf0140aebf Mon Sep 17 00:00:00 2001
From: Mattia Montanari <mattia.montanari@eng.ox.ac.uk>
Date: Sat, 18 Apr 2020 13:23:21 +0100
Subject: [PATCH] Create independent project (library) and example (demo C)

---
 CMakeLists.txt              | 53 ++++++++++++++++++-------------------
 cmake/COPYING-CMAKE-SCRIPTS | 22 +++++++++++++++
 examples/c/CMakeLists.txt   | 13 ---------
 3 files changed, 48 insertions(+), 40 deletions(-)
 create mode 100644 cmake/COPYING-CMAKE-SCRIPTS

diff --git a/CMakeLists.txt b/CMakeLists.txt
index bbb88e8..d58f358 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,31 +28,36 @@
 #                                                                         #
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - #
 
-message( "[${PROJECT_NAME}] CMake setting ..")
+cmake_minimum_required(VERSION   3.13)
 
-message(STATUS "Version     : " ${openGJK_VERSION}  )
+set(CMAKE_POLICY_DEFAULT_CMP0079 NEW)
+set(LIBRARY_VERSION              "2.0.3")
+
+project(openGJKlib VERSION ${LIBRARY_VERSION} LANGUAGES C)
+
+set(CMAKE_C_STANDARD 11)
+
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+include(CMakeDefaults)
+include(CompilerFlags)
+include(PlatformDefaults)
+
+message( "[${PROJECT_NAME}] CMake setting ..")
+message(STATUS "Version     : " ${CMAKE_PROJECT_VERSION}  )
 message(STATUS "Build type  : " ${CMAKE_BUILD_TYPE} )
 
-# Select source files
+# Specify project specific and user custum options
+include(CMakeProjectOptions)
+
 set( SOURCE_FILES src/openGJK.c )
 set( SOURCE_HEADS include/openGJK/openGJK.h)
 
-IF(USE_PREDICATES)
-    # for adpative floating-point artim.
-    set( SOURCE_FILES ${SOURCE_FILES} ext/predicates.c)
-    set( SOURCE_HEADS ${SOURCE_HEADS} ext/predicates.h)
-    # Add flag for adpative floating-point artim.
-    add_definitions(-DADAPTIVEFP)
-ENDIF()
-
 IF(BUILD_STATIC_LIB)
-    message(STATUS "Library type: " Static )
     add_library(${PROJECT_NAME} STATIC ${SOURCE_FILES} ${SOURCE_HEADS})
     add_definitions(-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DBUILD_SHARED_LIBS=FALSE)
 ELSE()
-    message(STATUS "Library type: " Shared )
     add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${SOURCE_HEADS})
-    add_definitions(-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DBUILD_SHARED_LIBS=FALSE)
+    add_definitions(-DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=TRUE -DBUILD_SHARED_LIBS=TRUE)
 ENDIF(BUILD_STATIC_LIB)
 
 # PLATFORM-SPECIFIC SETTING
@@ -63,22 +68,16 @@ else ()
     set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 endif ()
 
-find_package(OpenMP)
-if (OPENMP_FOUND)
-    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
-    set (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${OpenMP_EXE_LINKER_FLAGS}")
-endif()
-
 # ADD DEFAULT COMPILER FLAGS
 include(CompilerFlags)
 
 # Link include file
 target_include_directories( ${PROJECT_NAME} PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
-    target_link_libraries(${PROJECT_NAME} ${CMOCKA_LIBRARY} OpenMP::OpenMP_C )
 
-IF(USE_PREDICATES)
-    # for adpative floating-point artim.
-    target_include_directories( ${PROJECT_NAME}
-            PUBLIC ${PROJECT_SOURCE_DIR}/ext
-            )
-ENDIF()
\ No newline at end of file
+target_link_libraries(${PROJECT_NAME} ${CMOCKA_LIBRARY}  )
+
+if (WITH_EXAMPLES)
+    add_subdirectory(examples/c)
+endif (WITH_EXAMPLES)
+
+message(STATUS "Completed CMake setting for ${PROJECT_NAME}" )
\ No newline at end of file
diff --git a/cmake/COPYING-CMAKE-SCRIPTS b/cmake/COPYING-CMAKE-SCRIPTS
new file mode 100644
index 0000000..4b41776
--- /dev/null
+++ b/cmake/COPYING-CMAKE-SCRIPTS
@@ -0,0 +1,22 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products 
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/examples/c/CMakeLists.txt b/examples/c/CMakeLists.txt
index 7af719c..58024c1 100644
--- a/examples/c/CMakeLists.txt
+++ b/examples/c/CMakeLists.txt
@@ -62,17 +62,4 @@ else ()
     target_link_libraries(demo openGJKlib)
 endif ()
 
-
-include(AddCMockaTest)
-find_library(LIB_CMOCKA cmocka)
-    target_link_libraries(demo ${CMOCKA_LIBRARY})
-if(NOT LIB_CMOCKA)
-  message(STATUS "${LIB_CMOCKA} library not found ")
-endif() 
-
-if (UNIT_TESTING)
-    target_link_libraries(demo cmocka)
-    add_test( ${TEST_NAME} demo)
-endif (UNIT_TESTING)
-
 message(STATUS "Completed CMake setting for ${PROJECT_NAME}" )
\ No newline at end of file