Renaming of some macros

Author: jvdp1

.github/workflows/ci_modular.yml

@@ -58,9 +58,9 @@ jobs:
         -DCMAKE_MAXIMUM_RANK:String=4
         -DCMAKE_INSTALL_PREFIX=$PWD/_dist
         -DFIND_BLAS:STRING=FALSE
-        -DSTDLIB_NO_ANSI:STRING=${{ matrix.with_ansi }}
+        -DSTDLIB_ANSI:STRING=${{ matrix.with_ansi }}
         -DSTDLIB_BITSET:STRING=${{ matrix.with_bitset }}
-        -DSTDLIB_NO_HASHMAPS:STRING=${{ matrix.with_hashmaps }}
+        -DSTDLIB_HASHMAPS:STRING=${{ matrix.with_hashmaps }}
         -DSTDLIB_STATS:STRING=${{ matrix.with_stats }}
         -S . -B ${{ env.BUILD_DIR }}
 

CMakeLists.txt

@@ -66,11 +66,14 @@ else()
   add_compile_definitions(STDLIB_BITSET=0)
 endif() 
 
-option(STDLIB_NO_HASHMAPS "Does not compile STDLIB HASHMAPS" OFF)
+option(STDLIB_HASHMAPS "Compile STDLIB HASHMAPS" ON)
 
-if(STDLIB_NO_HASHMAPS)
+if(STDLIB_HASHMAPS)
+  message(STATUS "Enable stdlib hashmaps module")
+  add_compile_definitions(STDLIB_HASHMAPS=1)
+else()
   message(STATUS "Disable stdlib hashmaps module")
-  add_compile_definitions(STDLIB_NO_HASHMAPS)
+  add_compile_definitions(STDLIB_HASHMAPS=0)
 endif()
 
 option(STDLIB_STATS "Compile STDLIB STATS" ON)

example/CMakeLists.txt

@@ -16,7 +16,7 @@ endmacro(ADD_EXAMPLEPP)
 
 
 
-if (NOT STDLIB_NO_ANSI)
+if (STDLIB_ANSI)
   add_subdirectory(ansi)
 endif()
 add_subdirectory(array)
@@ -26,7 +26,7 @@ if (STDLIB_BITSET)
 endif()
 add_subdirectory(constants)
 add_subdirectory(error)
-if (NOT STDLIB_NO_HASHMAPS)
+if (STDLIB_HASHMAPS)
   add_subdirectory(hashmaps)
 endif()
 add_subdirectory(hash_procedures)

include/macros.inc

@@ -4,13 +4,6 @@
 #define STDLIB_BITSET 1
 #endif
 
-!Default: compile the hashmaps module
-#ifdef STDLIB_NO_HASHMAPS
-#define STDLIB_HASHMAPS 0
-#else
-#define STDLIB_HASHMAPS 1
-#endif
-
 !Default: compile the stats module
 #if !defined STDLIB_STATS
 #define STDLIB_STATS 1

src/CMakeLists.txt

@@ -1,4 +1,4 @@
-if (NOT STDLIB_NO_ANSI)
+if (STDLIB_ANSI)
   add_subdirectory(ansi)
 endif()
 
@@ -14,7 +14,7 @@ add_subdirectory(core)
 
 add_subdirectory(hash)
 
-if (NOT STDLIB_NO_HASHMAPS)
+if (STDLIB_HASHMAPS)
   add_subdirectory(hashmaps)
 endif()
 
@@ -56,10 +56,10 @@ target_link_libraries(${PROJECT_NAME} PUBLIC
   array
   constants
   core
-  $<$<NOT:$<BOOL:${STDLIB_NO_ANSI}>>:ansi>
+  $<$<BOOL:${STDLIB_ANSI}>:ansi>
   $<$<BOOL:${STDLIB_BITSET}>:bitsets>
   hash
-  $<$<NOT:$<BOOL:${STDLIB_NO_HASHMAPS}>>:hashmaps>
+  $<$<BOOL:${STDLIB_HASHMAPS}>:hashmaps>
   intrinsics
   io
   linalg_core

src/math/CMakeLists.txt

@@ -14,4 +14,4 @@ set(math_cppFiles
 
 configure_stdlib_target(math "" math_fppFiles math_cppFiles)
 
-target_link_libraries(math PUBLIC core strings $<$<NOT:$<BOOL:${STDLIB_NO_BITSET}>>:bitsets>)
+target_link_libraries(math PUBLIC core strings $<$<BOOL:${STDLIB_BITSET}>:bitsets>)

src/sorting/CMakeLists.txt

@@ -14,4 +14,4 @@ set(sorting_f90Files
 
 configure_stdlib_target(sorting sorting_f90Files sorting_fppFiles sorting_cppFiles)
 
-target_link_libraries(sorting PUBLIC core strings $<$<NOT:$<BOOL:${STDLIB_NO_BITSET}>>:bitsets>)
+target_link_libraries(sorting PUBLIC core strings $<$<BOOL:${STDLIB_BITSET}>:bitsets>)

test/CMakeLists.txt

@@ -35,7 +35,7 @@ endif()
 add_subdirectory(constants)
 add_subdirectory(hash_functions)
 add_subdirectory(hash_functions_perf)
-if (NOT STDLIB_NO_HASHMAPS)
+if (STDLIB_HASHMAPS)
   add_subdirectory(hashmaps)
 endif()
 add_subdirectory(intrinsics)
@@ -54,6 +54,6 @@ add_subdirectory(system)
 add_subdirectory(quadrature)
 add_subdirectory(math)
 add_subdirectory(stringlist)
-if (NOT STDLIB_NO_ANSI)
+if (STDLIB_ANSI)
   add_subdirectory(terminal)
 endif()