Merge pull request #276 from recp/cmake-fix-buildtype

cmake: prevent overriding CMAKE_BUILD_TYPE if it is subdirectory

CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 3.8.2)
 project(cglm
-  VERSION 0.8.8
+  VERSION 0.8.9
   HOMEPAGE_URL https://github.com/recp/cglm
   DESCRIPTION "OpenGL Mathematics (glm) for C"
   LANGUAGES C
@@ -41,7 +41,9 @@ else()
   add_compile_options(-Wall -Werror -O3)
 endif()
 
-if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
+get_directory_property(hasParent PARENT_DIRECTORY)
+
+if(NOT hasParent AND NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
   message(STATUS "Setting build type to '${DEFAULT_BUILD_TYPE}' as none was specified.")
   set(CMAKE_BUILD_TYPE "${DEFAULT_BUILD_TYPE}" CACHE STRING "Choose the type of build." FORCE)
   # Set the possible values of build type for cmake-gui
@@ -157,6 +159,20 @@ install(EXPORT      ${PROJECT_NAME}
         NAMESPACE   ${PROJECT_NAME}::
         DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME})
 
+set(PACKAGE_NAME ${PROJECT_NAME})
+set(prefix ${CMAKE_INSTALL_PREFIX})
+set(exec_prefix ${CMAKE_INSTALL_PREFIX})
+if (IS_ABSOLUTE "${CMAKE_INSTALL_INCLUDEDIR}")
+  set(includedir "${CMAKE_INSTALL_INCLUDEDIR}")
+else()
+  set(includedir "\${prefix}/${CMAKE_INSTALL_INCLUDEDIR}")
+endif()
+if (IS_ABSOLUTE "${CMAKE_INSTALL_LIBDIR}")
+  set(libdir "${CMAKE_INSTALL_LIBDIR}")
+else()
+  set(libdir "\${exec_prefix}/${CMAKE_INSTALL_LIBDIR}")
+endif()
+set(PACKAGE_VERSION "${PROJECT_VERSION}")
 configure_file(cglm.pc.in cglm.pc @ONLY)
 
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cglm.pc

cglm.pc.in

@@ -1,11 +1,11 @@
-prefix=@CMAKE_INSTALL_PREFIX@
+prefix=@prefix@
-exec_prefix="${prefix}"
+exec_prefix=@exec_prefix@
-libdir="${exec_prefix}/lib"
+libdir=@libdir@
-includedir="${prefix}/include"
+includedir=@includedir@
 
-Name: @PROJECT_NAME@
+Name: @PACKAGE_NAME@
-Description: @CMAKE_PROJECT_DESCRIPTION@
+Description: OpenGL Mathematics (glm) for C
-URL: @CMAKE_PROJECT_HOMEPAGE_URL@
+URL: https://github.com/recp/cglm
-Version: @PROJECT_VERSION@
+Version: @PACKAGE_VERSION@
 Cflags: -I${includedir}
 Libs: -L${libdir} -lcglm @LIBS@

cglm.podspec

@@ -2,7 +2,7 @@ Pod::Spec.new do |s|
 
   # Description
   s.name         = "cglm"
-  s.version      = "0.8.7"
+  s.version      = "0.8.8"
   s.summary      = "📽 Highly Optimized Graphics Math (glm) for C"
   s.description  = <<-DESC
 cglm is math library for graphics programming for C. See the documentation or README for all features.

configure.ac

@@ -7,7 +7,7 @@
 #*****************************************************************************
 
 AC_PREREQ([2.69])
-AC_INIT([cglm], [0.8.8], [info@recp.me])
+AC_INIT([cglm], [0.8.9], [info@recp.me])
 AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects serial-tests])
 
 # Don't use the default cflags (-O2 -g), we set ours manually in Makefile.am.

docs/source/conf.py

@@ -62,9 +62,9 @@ author = u'Recep Aslantas'
 # built documents.
 #
 # The short X.Y version.
-version = u'0.8.8'
+version = u'0.8.9'
 # The full version, including alpha/beta/rc tags.
-release = u'0.8.8'
+release = u'0.8.9'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

docs/source/ivec2.rst

@@ -8,6 +8,13 @@ Header: cglm/ivec2.h
 Table of contents (click to go):
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Macros:
+
+1. GLM_IVEC2_ONE_INIT
+#. GLM_IVEC2_ZERO_INIT
+#. GLM_IVEC2_ONE
+#. GLM_IVEC2_ZERO
+
 Functions:
 
 1. :c:func:`glm_ivec2`

docs/source/ivec3.rst

@@ -8,6 +8,13 @@ Header: cglm/ivec3.h
 Table of contents (click to go):
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Macros:
+
+1. GLM_IVEC3_ONE_INIT
+#. GLM_IVEC3_ZERO_INIT
+#. GLM_IVEC3_ONE
+#. GLM_IVEC3_ZERO
+
 Functions:
 
 1. :c:func:`glm_ivec3`

docs/source/ivec4.rst

@@ -8,6 +8,13 @@ Header: cglm/ivec4.h
 Table of contents (click to go):
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+Macros:
+
+1. GLM_IVEC4_ONE_INIT
+#. GLM_IVEC4_ZERO_INIT
+#. GLM_IVEC4_ONE
+#. GLM_IVEC4_ZERO
+
 Functions:
 
 1. :c:func:`glm_ivec4`

docs/source/vec2.rst

@@ -10,10 +10,10 @@ Table of contents (click to go):
 
 Macros:
 
-1. GLM_vec2_ONE_INIT
+1. GLM_VEC2_ONE_INIT
-#. GLM_vec2_ZERO_INIT
+#. GLM_VEC2_ZERO_INIT
-#. GLM_vec2_ONE
+#. GLM_VEC2_ONE
-#. GLM_vec2_ZERO
+#. GLM_VEC2_ZERO
 
 Functions:
 

include/cglm/common.h

@@ -45,7 +45,7 @@
 
 #ifndef CGLM_USE_DEFAULT_EPSILON
 #  ifndef GLM_FLT_EPSILON
-#    define GLM_FLT_EPSILON 1e-5
+#    define GLM_FLT_EPSILON 1e-5f
 #  endif
 #else
 #  define GLM_FLT_EPSILON FLT_EPSILON

include/cglm/io.h

@@ -49,7 +49,7 @@
 #endif
 
 #ifndef CGLM_PRINT_MAX_TO_SHORT
-#  define CGLM_PRINT_MAX_TO_SHORT 1e5
+#  define CGLM_PRINT_MAX_TO_SHORT 1e5f
 #endif
 
 #ifndef CGLM_PRINT_COLOR
@@ -77,9 +77,9 @@ glm_mat4_print(mat4              matrix,
   for (i = 0; i < m; i++) {
     for (j = 0; j < n; j++) {
       if (matrix[i][j] < CGLM_PRINT_MAX_TO_SHORT)
-        cwi = sprintf(buff, "% .*f", CGLM_PRINT_PRECISION, matrix[i][j]);
+        cwi = sprintf(buff, "% .*f", CGLM_PRINT_PRECISION, (double)matrix[i][j]);
       else
-        cwi = sprintf(buff, "% g", matrix[i][j]);
+        cwi = sprintf(buff, "% g", (double)matrix[i][j]);
       cw[i] = GLM_MAX(cw[i], cwi);
     }
   }
@@ -89,9 +89,9 @@ glm_mat4_print(mat4              matrix,
 
     for (j = 0; j < n; j++)
       if (matrix[i][j] < CGLM_PRINT_MAX_TO_SHORT)
-        fprintf(ostream, " % *.*f", cw[j], CGLM_PRINT_PRECISION, matrix[j][i]);
+        fprintf(ostream, " % *.*f", cw[j], CGLM_PRINT_PRECISION, (double)matrix[j][i]);
       else
-        fprintf(ostream, " % *g", cw[j], matrix[j][i]);
+        fprintf(ostream, " % *g", cw[j], (double)matrix[j][i]);
 
     fprintf(ostream, "  |\n");
   }
@@ -120,9 +120,9 @@ glm_mat3_print(mat3              matrix,
   for (i = 0; i < m; i++) {
     for (j = 0; j < n; j++) {
       if (matrix[i][j] < CGLM_PRINT_MAX_TO_SHORT)
-        cwi = sprintf(buff, "% .*f", CGLM_PRINT_PRECISION, matrix[i][j]);
+        cwi = sprintf(buff, "% .*f", CGLM_PRINT_PRECISION, (double)matrix[i][j]);
       else
-        cwi = sprintf(buff, "% g", matrix[i][j]);
+        cwi = sprintf(buff, "% g", (double)matrix[i][j]);
       cw[i] = GLM_MAX(cw[i], cwi);
     }
   }
@@ -132,9 +132,9 @@ glm_mat3_print(mat3              matrix,
 
     for (j = 0; j < n; j++)
       if (matrix[i][j] < CGLM_PRINT_MAX_TO_SHORT)
-        fprintf(ostream, " % *.*f", cw[j], CGLM_PRINT_PRECISION, matrix[j][i]);
+        fprintf(ostream, " % *.*f", cw[j], CGLM_PRINT_PRECISION, (double)matrix[j][i]);
       else
-        fprintf(ostream, " % *g", cw[j], matrix[j][i]);
+        fprintf(ostream, " % *g", cw[j], (double)matrix[j][i]);
 
     fprintf(ostream, "  |\n");
   }
@@ -162,9 +162,9 @@ glm_mat2_print(mat2              matrix,
   for (i = 0; i < m; i++) {
     for (j = 0; j < n; j++) {
       if (matrix[i][j] < CGLM_PRINT_MAX_TO_SHORT)
-        cwi = sprintf(buff, "% .*f", CGLM_PRINT_PRECISION, matrix[i][j]);
+        cwi = sprintf(buff, "% .*f", CGLM_PRINT_PRECISION, (double)matrix[i][j]);
       else
-        cwi = sprintf(buff, "% g", matrix[i][j]);
+        cwi = sprintf(buff, "% g", (double)matrix[i][j]);
       cw[i] = GLM_MAX(cw[i], cwi);
     }
   }
@@ -174,9 +174,9 @@ glm_mat2_print(mat2              matrix,
 
     for (j = 0; j < n; j++)
       if (matrix[i][j] < CGLM_PRINT_MAX_TO_SHORT)
-        fprintf(ostream, " % *.*f", cw[j], CGLM_PRINT_PRECISION, matrix[j][i]);
+        fprintf(ostream, " % *.*f", cw[j], CGLM_PRINT_PRECISION, (double)matrix[j][i]);
       else
-        fprintf(ostream, " % *g", cw[j], matrix[j][i]);
+        fprintf(ostream, " % *g", cw[j], (double)matrix[j][i]);
 
     fprintf(ostream, "  |\n");
   }
@@ -199,9 +199,9 @@ glm_vec4_print(vec4              vec,
 
   for (i = 0; i < m; i++) {
     if (vec[i] < CGLM_PRINT_MAX_TO_SHORT)
-      fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, vec[i]);
+      fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, (double)vec[i]);
     else
-      fprintf(ostream, " % g", vec[i]);
+      fprintf(ostream, " % g", (double)vec[i]);
   }
 
   fprintf(ostream, "  )" CGLM_PRINT_COLOR_RESET "\n\n");
@@ -221,9 +221,9 @@ glm_vec3_print(vec3              vec,
 
   for (i = 0; i < m; i++) {
     if (vec[i] < CGLM_PRINT_MAX_TO_SHORT)
-      fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, vec[i]);
+      fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, (double)vec[i]);
     else
-      fprintf(ostream, " % g", vec[i]);
+      fprintf(ostream, " % g", (double)vec[i]);
   }
 
   fprintf(ostream, "  )" CGLM_PRINT_COLOR_RESET "\n\n");
@@ -261,9 +261,9 @@ glm_vec2_print(vec2              vec,
 
   for (i = 0; i < m; i++) {
     if (vec[i] < CGLM_PRINT_MAX_TO_SHORT)
-      fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, vec[i]);
+      fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, (double)vec[i]);
     else
-      fprintf(ostream, " % g", vec[i]);
+      fprintf(ostream, " % g", (double)vec[i]);
   }
 
   fprintf(ostream, "  )" CGLM_PRINT_COLOR_RESET "\n\n");
@@ -283,9 +283,9 @@ glm_versor_print(versor            vec,
 
   for (i = 0; i < m; i++) {
     if (vec[i] < CGLM_PRINT_MAX_TO_SHORT)
-      fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, vec[i]);
+      fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, (double)vec[i]);
     else
-      fprintf(ostream, " % g", vec[i]);
+      fprintf(ostream, " % g", (double)vec[i]);
   }
 
 
@@ -310,9 +310,9 @@ glm_aabb_print(vec3                    bbox[2],
 
     for (j = 0; j < m; j++) {
       if (bbox[i][j] < CGLM_PRINT_MAX_TO_SHORT)
-        fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, bbox[i][j]);
+        fprintf(ostream, " % .*f", CGLM_PRINT_PRECISION, (double)bbox[i][j]);
       else
-        fprintf(ostream, " % g", bbox[i][j]);
+        fprintf(ostream, " % g", (double)bbox[i][j]);
     }
 
     fprintf(ostream, "  )\n");

include/cglm/ivec2.h

@@ -6,7 +6,13 @@
  */
 
 /*
-FUNCTIONS:
+ Macros:
+   GLM_IVEC2_ONE_INIT
+   GLM_IVEC2_ZERO_INIT
+   GLM_IVEC2_ONE
+   GLM_IVEC2_ZERO
+
+ Functions:
   CGLM_INLINE void glm_ivec2(int * __restrict v, ivec2 dest)
   CGLM_INLINE void glm_ivec2_copy(ivec2 a, ivec2 dest)
   CGLM_INLINE void glm_ivec2_zero(ivec2 v)
@@ -30,6 +36,12 @@ FUNCTIONS:
 
 #include "common.h"
 
+#define GLM_IVEC2_ONE_INIT   {1, 1}
+#define GLM_IVEC2_ZERO_INIT  {0, 0}
+
+#define GLM_IVEC2_ONE  ((ivec2)GLM_IVEC2_ONE_INIT)
+#define GLM_IVEC2_ZERO ((ivec2)GLM_IVEC2_ZERO_INIT)
+
 /*!
  * @brief init ivec2 using vec3 or vec4
  *

include/cglm/ivec3.h

@@ -6,7 +6,13 @@
  */
 
 /*
-FUNCTIONS:
+ Macros:
+   GLM_IVEC3_ONE_INIT
+   GLM_IVEC3_ZERO_INIT
+   GLM_IVEC3_ONE
+   GLM_IVEC3_ZERO
+
+ Functions:
   CGLM_INLINE void glm_ivec3(ivec4 v4, ivec3 dest)
   CGLM_INLINE void glm_ivec3_copy(ivec3 a, ivec3 dest)
   CGLM_INLINE void glm_ivec3_zero(ivec3 v)
@@ -30,6 +36,12 @@ FUNCTIONS:
 
 #include "common.h"
 
+#define GLM_IVEC3_ONE_INIT   {1, 1, 1}
+#define GLM_IVEC3_ZERO_INIT  {0, 0, 0}
+
+#define GLM_IVEC3_ONE  ((ivec3)GLM_IVEC3_ONE_INIT)
+#define GLM_IVEC3_ZERO ((ivec3)GLM_IVEC3_ZERO_INIT)
+
 /*!
  * @brief init ivec3 using ivec4
  *

include/cglm/ivec4.h

@@ -6,7 +6,13 @@
  */
 
 /*
-FUNCTIONS:
+ Macros:
+   GLM_IVEC4_ONE_INIT
+   GLM_IVEC4_ZERO_INIT
+   GLM_IVEC4_ONE
+   GLM_IVEC4_ZERO
+
+ Functions:
   CGLM_INLINE void glm_ivec4(ivec3 v3, int last, ivec4 dest)
   CGLM_INLINE void glm_ivec4_copy(ivec4 a, ivec4 dest)
   CGLM_INLINE void glm_ivec4_zero(ivec4 v)
@@ -30,6 +36,12 @@ FUNCTIONS:
 
 #include "common.h"
 
+#define GLM_IVEC4_ONE_INIT   {1, 1, 1, 1}
+#define GLM_IVEC4_ZERO_INIT  {0, 0, 0, 0}
+
+#define GLM_IVEC4_ONE  ((ivec4)GLM_IVEC4_ONE_INIT)
+#define GLM_IVEC4_ZERO ((ivec4)GLM_IVEC4_ZERO_INIT)
+
 /*!
  * @brief init ivec4 using ivec3
  *

include/cglm/version.h

@@ -10,6 +10,6 @@
 
 #define CGLM_VERSION_MAJOR 0
 #define CGLM_VERSION_MINOR 8
-#define CGLM_VERSION_PATCH 8
+#define CGLM_VERSION_PATCH 9
 
 #endif /* cglm_version_h */

meson.build

@@ -1,5 +1,5 @@
 project('cglm', 'c',
-    version : '0.8.8',
+    version : '0.8.9',
     license : 'mit',
     default_options : [
         'c_std=c11',