Addition of macros.inc

Author: jvdp1

.github/workflows/ci_modular.yml

@@ -55,7 +55,7 @@ jobs:
         -DCMAKE_MAXIMUM_RANK:String=4
         -DCMAKE_INSTALL_PREFIX=$PWD/_dist
         -DFIND_BLAS:STRING=FALSE
-        -DSTDLIB_WITH_BITSET:STRING=${{ matrix.with_bitset }}
+        -DSTDLIB_NO_BITSET:STRING=${{ matrix.with_bitset }}
         -S . -B ${{ env.BUILD_DIR }}
 
     - name: Build and compile

CMakeLists.txt

@@ -49,12 +49,11 @@ if(NOT DEFINED CMAKE_MAXIMUM_RANK)
   set(CMAKE_MAXIMUM_RANK 4 CACHE STRING "Maximum array rank for generated procedures")
 endif()
 
+option(STDLIB_NO_BITSET "Does not compile STDLIB BITSET" OFF)
 
-option(STDLIB_WITH_BITSET "Compile STDLIB BITSET" ON)
-
-if(STDLIB_WITH_BITSET)
-  message(STATUS "Enable stdlib bitset module")
-  add_compile_definitions(STDLIB_BITSET)
+if(STDLIB_NO_BITSET)
+  message(STATUS "Disable stdlib bitset module")
+  add_compile_definitions(STDLIB_NO_BITSET)
 endif() 
 
 option(FIND_BLAS "Find external BLAS and LAPACK" ON)
@@ -136,6 +135,7 @@ list(
   "-I${PROJECT_SOURCE_DIR}/include"
 )
 
+include_directories(${PROJECT_SOURCE_DIR}/include)
 add_subdirectory(src)
 
 if(BUILD_TESTING)

example/CMakeLists.txt

@@ -19,7 +19,7 @@ endmacro(ADD_EXAMPLEPP)
 add_subdirectory(ansi)
 add_subdirectory(array)
 add_subdirectory(ascii)
-if (STDLIB_WITH_BITSET)
+if (NOT STDLIB_NO_BITSET)
   add_subdirectory(bitsets)
 endif()
 add_subdirectory(constants)

example/math/example_math_swap.F90

@@ -1,3 +1,4 @@
+#include 'macros.inc'
 program example_math_swap
     use stdlib_math, only: swap
     implicit none

example/sorting/CMakeLists.txt

@@ -3,6 +3,6 @@ ADD_EXAMPLE(sort)
 ADD_EXAMPLE(sort_adjoint)
 ADD_EXAMPLE(sort_index)
 ADD_EXAMPLE(radix_sort)
-if (STDLIB_WITH_BITSET)
+if (NOT STDLIB_NO_BITSET)
   ADD_EXAMPLE(sort_bitset)
 endif()

include/macros.inc

@@ -0,0 +1,7 @@
+
+!Default: compile the bitset module
+#define STDLIB_BITSET
+
+#ifdef STDLIB_NO_BITSET
+  #undef STDLIB_BITSET
+#endif

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-if (STDLIB_WITH_BITSET)
+if (NOT STDLIB_NO_BITSET)
   add_subdirectory(bitsets)
 endif()
 add_subdirectory(blas)
@@ -123,5 +123,5 @@ set(f90Files
 configure_stdlib_target(${PROJECT_NAME} f90Files fppFiles cppFiles)
 
 target_link_libraries(${PROJECT_NAME} PUBLIC
-  $<$<BOOL:${STDLIB_WITH_BITSET}>:bitsets>
+  $<$<NOT:$<BOOL:${STDLIB_NO_BITSET}>>:bitsets>
   blas lapack)

src/stdlib_math.fypp

@@ -1,3 +1,4 @@
+#include 'macros.inc'
 #:include "common.fypp"
 #:set IR_KINDS_TYPES = INT_KINDS_TYPES + REAL_KINDS_TYPES
 #:set RC_KINDS_TYPES = REAL_KINDS_TYPES + CMPLX_KINDS_TYPES

src/stdlib_sorting.fypp

@@ -1,3 +1,4 @@
+#include 'macros.inc'
 #:include "common.fypp"
 
 #:set INT_TYPES_ALT_NAME = list(zip(INT_TYPES, INT_TYPES, INT_KINDS, INT_CPPS))

src/stdlib_sorting_ord_sort.fypp

@@ -1,3 +1,4 @@
+#include 'macros.inc'
 #:include "common.fypp"
 #:set INT_TYPES_ALT_NAME = list(zip(INT_TYPES, INT_TYPES, INT_TYPES, INT_KINDS, INT_CPPS))
 #:set REAL_TYPES_ALT_NAME = list(zip(REAL_TYPES, REAL_TYPES, REAL_TYPES, REAL_KINDS, REAL_CPPS))