Merge 2514515 into 5808ef9

osqp · Sep 30, 2021 · daa5799 · daa5799
2 parents 5808ef9 + 2514515
commit daa5799
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -60,13 +60,15 @@ endif (NOT MSVC)
 # numeric types
 if(DFLOAT)
   set(QDLDL_FLOAT_TYPE "float")
+  set(QDLDL_DFLOAT 1)
 else()
 	set(QDLDL_FLOAT_TYPE "double")
 endif()
 
 if(DLONG)
   set(QDLDL_INT_TYPE "long long")
 	set(QDLDL_INT_TYPE_MAX "LLONG_MAX")
+  set(QDLDL_DLONG 1)
 else()
 	set(QDLDL_INT_TYPE "int")
 	set(QDLDL_INT_TYPE_MAX "INT_MAX")
@@ -78,6 +80,8 @@ endif()
 #problems when calling QDLDL from C++
 set(QDLDL_BOOL_TYPE "unsigned char")
 
+# Generate header file with the global options
+# ---------------------------------------------
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/configure/qdldl_types.h.in
                ${CMAKE_CURRENT_SOURCE_DIR}/include/qdldl_types.h
                NEWLINE_STYLE LF)

diff --git a/configure/qdldl_types.h.in b/configure/qdldl_types.h.in
@@ -16,6 +16,16 @@ typedef @QDLDL_BOOL_TYPE@   QDLDL_bool;  /* for boolean values  */
 //Maximum value of the signed type QDLDL_int.
 #define QDLDL_INT_MAX @QDLDL_INT_TYPE_MAX@
 
+/*
+ * Configuration options
+ */
+
+/* When defined, QDLDL is using floats instead of doubles */
+#cmakedefine QDLDL_DFLOAT
+
+/* When defined, QDLDL is using long long instead of int types */
+#cmakedefine QDLDL_DLONG
+
 # ifdef __cplusplus
 }
 # endif /* ifdef __cplusplus */