Merge branch 'master' into development

CMakeLists.txt

@@ -21,7 +21,6 @@ option(BUILD_LS_MATH_WITH_TESTS "Build project with tests..." OFF)
 option(BUILD_LS_MATH_WITH_SUPPORTED_COMPILER "Build project with supported compiler only..." ON)
 option(BUILD_LS_MATH_STATIC "Build ls-math static library..." ON)
 option(BUILD_LS_MATH_SHARED "Build ls-math shared library..." OFF)
-option(BUILD_LS_MATH_MODULE "Build ls-math module library..." OFF)
 
 set(TARGET_COUNTER 0)
 
@@ -35,11 +34,6 @@ if (${BUILD_LS_MATH_SHARED})
     set(GOAL "shared library")
 endif ()
 
-if (${BUILD_LS_MATH_MODULE})
-    math(EXPR TARGET_COUNTER "${TARGET_COUNTER} + 1")
-    set(GOAL "module library")
-endif ()
-
 message("${PROJECT_NAME}: [Goal] ${GOAL}")
 
 if (TARGET_COUNTER GREATER 1)
@@ -72,28 +66,15 @@ if(${BUILD_LS_MATH_WITH_SUPPORTED_COMPILER})
 
     if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC OR
             ${CMAKE_CXX_COMPILER_ID} STREQUAL GNU OR
-            ${CMAKE_CXX_COMPILER_ID} STREQUAL Clang)
+            ${CMAKE_CXX_COMPILER_ID} STREQUAL ClangOR OR
+            ${CMAKE_CXX_COMPILER_ID} STREQUAL AppleClang)
         message("${PROJECT_NAME}: ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} is supported...")
     else()
         message("${PROJECT_NAME}: [Error] ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} is not supported... terminated!")
         return()
     endif ()
-
-    # define which compilers are supported for shared or module goal
-
-    if (${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC AND ${BUILD_LS_MATH_MODULE})
-        message("${PROJECT_NAME}: [Error] building \"${GOAL}\" with ${CMAKE_CXX_COMPILER_ID} ${CMAKE_CXX_COMPILER_VERSION} is not supported... terminated!")
-        return()
-    endif ()
 endif()
 
-# define which goals can run tests
-
-if (${BUILD_LS_MATH_WITH_TESTS} AND ${BUILD_LS_MATH_MODULE})
-    message("${PROJECT_NAME}: [Error] building \"${GOAL}\" with tests is not supported... terminated!")
-    return()
-endif ()
-
 ######################################################
 # Include Directories
 ######################################################
@@ -156,7 +137,7 @@ endif ()
 
 if (${BUILD_LS_MATH_WITH_TESTS})
     message("${MODULE_NAME_LS_MATH_VECTOR}: Building tests...")
-    add_executable(${MODULE_NAME_LS_MATH_VECTOR}_test ${TEST_FILES_LS_MATH_VECTOR})
+    add_executable(${MODULE_NAME_LS_MATH_VECTOR}-test ${TEST_FILES_LS_MATH_VECTOR})
 endif ()
 
 ####################################################################################################################
@@ -175,18 +156,13 @@ message("${PROJECT_NAME}: Building ${MODULE_NAME_LS_MATH_VECTOR} library version
 
 if (${BUILD_LS_MATH_STATIC})
     add_library("${MODULE_NAME_LS_MATH_VECTOR}" STATIC ${SOURCE_FILES_LS_MATH_VECTOR})
-    set_target_properties("${MODULE_NAME_LS_MATH_VECTOR}" PROPERTIES DEBUG_POSTFIX "_d")
+    set_target_properties("${MODULE_NAME_LS_MATH_VECTOR}" PROPERTIES DEBUG_POSTFIX "-d")
 endif ()
 
 if (${BUILD_LS_MATH_SHARED})
     add_library("${MODULE_NAME_LS_MATH_VECTOR}" SHARED ${SOURCE_FILES_LS_MATH_VECTOR})
     target_link_libraries("${MODULE_NAME_LS_MATH_VECTOR}" ${MODULE_NAME_CORE})
-    set_target_properties("${MODULE_NAME_LS_MATH_VECTOR}" PROPERTIES DEBUG_POSTFIX "_d")
-endif ()
-
-if (${BUILD_LS_MATH_MODULE})
-    add_library("${MODULE_NAME_LS_MATH_VECTOR}" MODULE ${SOURCE_FILES_LS_MATH_VECTOR})
-    set_target_properties("${MODULE_NAME_LS_MATH_VECTOR}" PROPERTIES DEBUG_POSTFIX "_d")
+    set_target_properties("${MODULE_NAME_LS_MATH_VECTOR}" PROPERTIES DEBUG_POSTFIX "-d")
 endif ()
 
 ####################################################################################################################
@@ -203,7 +179,7 @@ endif ()
 
 if (${BUILD_LS_MATH_WITH_TESTS})
     message("${MODULE_NAME_LS_MATH_VECTOR}: Linking libraries for test application...")
-    target_link_libraries(${MODULE_NAME_LS_MATH_VECTOR}_test
+    target_link_libraries(${MODULE_NAME_LS_MATH_VECTOR}-test
             gtest
             gmock
             gtest_main

README.md

@@ -15,7 +15,7 @@ This module provides vector functionalities of a cartesian coordinate system.
 
 #### Features ####
 
-- none 
+- AppleClang compiler is now officially supported
 
 #### Improvements ####