Update CMakeLists.txt

CMakeLists.txt

@@ -1,8 +1,9 @@
 cmake_minimum_required(VERSION 3.8.2)
 project(cglm VERSION 0.7.6 LANGUAGES C)
 
-set(C_STANDARD 11)
+set(CMAKE_C_STANDARD 11)
-set(C_STANDARD_REQUIRED YES)
+set(CMAKE_C_STANDARD_REQUIRED YES)
+set(DEFAULT_BUILD_TYPE "Release")
 
 set(CGLM_BUILD)
 option(CGLM_SHARED "Shared build" ON)
@@ -22,124 +23,26 @@ endif()
 
 if(MSVC)
 	add_definitions(-DNDEBUG -D_WINDOWS -D_USRDLL -DCGLM_EXPORTS -DCGLM_DLL)
-	add_compile_options("/W3" "/Ox" "/Gy" "/Oi" "/TC" "/analyze")
+	add_compile_options(/W3 /Ox /Gy /Oi /TC)
 else()
-    add_compile_options("-Wall" "-Werror" "-std=gnu11" "-O3")
+  add_compile_options(-Wall -Werror -O3)
-    if ("${CMAKE_C_COMPILER_ID}" STREQUAL "Clang")
-		  # Currently, nothing special to be seen here.
-    else()
-		  add_compile_options("-Werror=strict-prototypes")
-    endif()
 endif()
 
-set(HEADERS
+if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
-  include/cglm/version.h
+  message(STATUS "Setting build type to '${DEFAULT_BUILD_TYPE}' as none was specified.")
-  include/cglm/common.h
+  set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "Choose the type of build." FORCE)
-  include/cglm/types.h
+  # Set the possible values of build type for cmake-gui
-  include/cglm/types-struct.h
+  set_property(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
-  include/cglm/cglm.h
+endif()
-  include/cglm/call.h
-  include/cglm/struct.h
-  include/cglm/cam.h
-  include/cglm/io.h
-  include/cglm/mat4.h
-  include/cglm/mat3.h
-  include/cglm/mat2.h
-  include/cglm/affine.h
-  include/cglm/vec2.h
-  include/cglm/vec2-ext.h
-  include/cglm/vec3.h
-  include/cglm/vec3-ext.h
-  include/cglm/vec4.h
-  include/cglm/vec4-ext.h
-  include/cglm/euler.h
-  include/cglm/util.h
-  include/cglm/quat.h
-  include/cglm/affine-mat.h
-  include/cglm/plane.h
-  include/cglm/frustum.h
-  include/cglm/box.h
-  include/cglm/color.h
-  include/cglm/project.h
-  include/cglm/sphere.h
-  include/cglm/ease.h
-  include/cglm/curve.h
-  include/cglm/bezier.h
-  include/cglm/applesimd.h
-  include/cglm/ray.h
-  )
 
-set(HEADERS_CALL
+include(GNUInstallDirs)
-  include/cglm/call/mat4.h
-  include/cglm/call/mat3.h
-  include/cglm/call/mat2.h
-  include/cglm/call/vec2.h
-  include/cglm/call/vec3.h
-  include/cglm/call/vec4.h
-  include/cglm/call/affine.h
-  include/cglm/call/io.h
-  include/cglm/call/cam.h
-  include/cglm/call/quat.h
-  include/cglm/call/euler.h
-  include/cglm/call/plane.h
-  include/cglm/call/frustum.h
-  include/cglm/call/box.h
-  include/cglm/call/project.h
-  include/cglm/call/sphere.h
-  include/cglm/call/ease.h
-  include/cglm/call/curve.h
-  include/cglm/call/bezier.h
-  include/cglm/call/ray.h
-  )
 
-set(HEADERS_SIMD
+set(CPACK_PROJECT_NAME ${PROJECT_NAME})
-  include/cglm/simd/intrin.h
+set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})
-  include/cglm/simd/x86.h
+include(CPack)
-  include/cglm/simd/arm.h
-  )
 
-set(HEADERS_SIMD_SSE2
+# Target Start
-  include/cglm/simd/sse2/affine.h
+add_library(${PROJECT_NAME}
-  include/cglm/simd/sse2/mat4.h
-  include/cglm/simd/sse2/mat3.h
-  include/cglm/simd/sse2/mat2.h
-  include/cglm/simd/sse2/quat.h
-  )
-
-set(HEADERS_SIMD_AVX
-   include/cglm/simd/avx/mat4.h
-   include/cglm/simd/avx/affine.h
-   )
-
-set(HEADERS_SIMD_NEON
-   include/cglm/simd/neon/mat4.h
-   )
-
-set(HEADERS_STRUCT
-  include/cglm/struct/mat4.h
-  include/cglm/struct/mat3.h
-  include/cglm/struct/mat2.h
-  include/cglm/struct/vec2.h
-  include/cglm/struct/vec2-ext.h
-  include/cglm/struct/vec3.h
-  include/cglm/struct/vec3-ext.h
-  include/cglm/struct/vec4.h
-  include/cglm/struct/vec4-ext.h
-  include/cglm/struct/affine.h
-  include/cglm/struct/io.h
-  include/cglm/struct/cam.h
-  include/cglm/struct/quat.h
-  include/cglm/struct/euler.h
-  include/cglm/struct/plane.h
-  include/cglm/struct/frustum.h
-  include/cglm/struct/box.h
-  include/cglm/struct/project.h
-  include/cglm/struct/sphere.h
-  include/cglm/struct/color.h
-  include/cglm/struct/curve.h
-  )
-
-add_library(cglm
   ${CGLM_BUILD}
   src/euler.c
   src/affine.c
@@ -163,33 +66,24 @@ add_library(cglm
   src/ray.c
   )
 
-set_target_properties(cglm PROPERTIES VERSION ${PROJECT_VERSION} 
+set_target_properties(${PROJECT_NAME} PROPERTIES
-                                    SOVERSION ${PROJECT_VERSION_MAJOR})
+                              VERSION ${PROJECT_VERSION} 
+                            SOVERSION ${PROJECT_VERSION_MAJOR})
 
-target_include_directories(cglm PUBLIC
+target_include_directories(${PROJECT_NAME} PRIVATE include)
-  ${CMAKE_CURRENT_SOURCE_DIR}/include
+include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include)
-)
 
-install(
+# Install 
-	TARGETS	cglm
+install(TARGETS ${PROJECT_NAME}
-	EXPORT cglm
+        EXPORT  ${PROJECT_NAME}
-	ARCHIVE DESTINATION lib/ COMPONENT development
+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-	LIBRARY DESTINATION lib/ COMPONENT runtime NAMELINK_SKIP
-	RUNTIME DESTINATION ${CMAKE_INSTALL_NAME_DIR} COMPONENT runtime
-)
 
-if(CGLM_SHARED)
+install(DIRECTORY include/${PROJECT_NAME} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-	install(
+        PATTERN ".*" EXCLUDE)
-		TARGETS	cglm
-		EXPORT cglm
-		LIBRARY DESTINATION include/ COMPONENT development NAMELINK_ONLY
-	)
-endif()
-
-INSTALL(DIRECTORY include/ DESTINATION include)
 
 # Test Configuration
 if(CGLM_USE_TEST)
+  include(CTest)
   enable_testing()
   add_subdirectory(test)
 endif()