cleanup on isle 5, and renaming fixed-size decimal integer build target

stillwater-sc · Jan 16, 2024 · 0679efc · 0679efc
1 parent 062b318
commit 0679efc
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 18 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -211,44 +211,45 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 message(STATUS "C++20 has been enabled by default")
 
 # enable the regression testing level of the build
-message(STATUS "BUILD_REGRESSION_STRESS   ${BUILD_REGRESSION_STRESS}  ")
-message(STATUS "BUILD_REGRESSION_SANITY   ${BUILD_REGRESSION_SANITY}  ")
-message(STATUS "BUILD_REGRESSION_LEVEL_1  ${BUILD_REGRESSION_LEVEL_1}  ")
-message(STATUS "BUILD_REGRESSION_LEVEL_2  ${BUILD_REGRESSION_LEVEL_2}  ")
-message(STATUS "BUILD_REGRESSION_LEVEL_3  ${BUILD_REGRESSION_LEVEL_3}  ")
-message(STATUS "BUILD_REGRESSION_LEVEL_4  ${BUILD_REGRESSION_LEVEL_4}  ")
+#debug messages to troubleshoot regression level build configuration
+#message(STATUS "BUILD_REGRESSION_STRESS   ${BUILD_REGRESSION_STRESS}  ")
+#message(STATUS "BUILD_REGRESSION_SANITY   ${BUILD_REGRESSION_SANITY}  ")
+#message(STATUS "BUILD_REGRESSION_LEVEL_1  ${BUILD_REGRESSION_LEVEL_1}  ")
+#message(STATUS "BUILD_REGRESSION_LEVEL_2  ${BUILD_REGRESSION_LEVEL_2}  ")
+#message(STATUS "BUILD_REGRESSION_LEVEL_3  ${BUILD_REGRESSION_LEVEL_3}  ")
+#message(STATUS "BUILD_REGRESSION_LEVEL_4  ${BUILD_REGRESSION_LEVEL_4}  ")
 if(BUILD_REGRESSION_STRESS)
-	message(STATUS "BUILD_REGRESSION_STRESS")
+	message(STATUS "BUILD_REGRESSION_STRESS   ${BUILD_REGRESSION_STRESS}")
 	set(BUILD_REGRESSION_LEVEL_4 ON)
 	set(BUILD_REGRESSION_SANITY OFF)
 elseif(BUILD_REGRESSION_SANITY)
-	message(STATUS "BUILD_REGRESSION_SANITY")
+	message(STATUS "BUILD_REGRESSION_SANITY   ${BUILD_REGRESSION_SANITY}")
 	set(BUILD_REGRESSION_LEVEL_1 ON)
 endif(BUILD_REGRESSION_STRESS)
 
 if(BUILD_REGRESSION_LEVEL_4)
-	message(STATUS "BUILD_REGRESSION_LEVEL_4")
+	message(STATUS "BUILD_REGRESSION_LEVEL_4  ${BUILD_REGRESSION_LEVEL_4}")
 	add_definitions(-D REGRESSION_LEVEL_OVERRIDE)
 	add_definitions(-D REGRESSION_LEVEL_1=1)
 	add_definitions(-D REGRESSION_LEVEL_2=1)
 	add_definitions(-D REGRESSION_LEVEL_3=1)
 	add_definitions(-D REGRESSION_LEVEL_4=1)
 elseif(BUILD_REGRESSION_LEVEL_3)
-	message(STATUS "BUILD_REGRESSION_LEVEL_3")
+	message(STATUS "BUILD_REGRESSION_LEVEL_3  ${BUILD_REGRESSION_LEVEL_3}")
 	add_definitions(-D REGRESSION_LEVEL_OVERRIDE)
 	add_definitions(-D REGRESSION_LEVEL_1=1)
 	add_definitions(-D REGRESSION_LEVEL_2=1)
 	add_definitions(-D REGRESSION_LEVEL_3=1)
 	add_definitions(-D REGRESSION_LEVEL_4=0)
 elseif(BUILD_REGRESSION_LEVEL_2)
-	message(STATUS "BUILD_REGRESSION_LEVEL_2")
+	message(STATUS "BUILD_REGRESSION_LEVEL_2  ${BUILD_REGRESSION_LEVEL_2}")
 	add_definitions(-D REGRESSION_LEVEL_OVERRIDE)
 	add_definitions(-D REGRESSION_LEVEL_1=1)
 	add_definitions(-D REGRESSION_LEVEL_2=1)
 	add_definitions(-D REGRESSION_LEVEL_3=0)
 	add_definitions(-D REGRESSION_LEVEL_4=0)
 elseif(BUILD_REGRESSION_LEVEL_1)
-	message(STATUS "BUILD_REGRESSION_LEVEL_1")
+	message(STATUS "BUILD_REGRESSION_LEVEL_1  ${BUILD_REGRESSION_LEVEL_1}")
 	add_definitions(-D REGRESSION_LEVEL_OVERRIDE)
 	add_definitions(-D REGRESSION_LEVEL_1=1)
 	add_definitions(-D REGRESSION_LEVEL_2=0)

diff --git a/static/integer/decimal/CMakeLists.txt b/static/integer/decimal/CMakeLists.txt
@@ -5,9 +5,9 @@ file(GLOB ARITHMETIC_SRC  "arithmetic/*.cpp")
 file(GLOB MATH_SRC        "math/*.cpp")
 file(GLOB PERFORMANCE_SRC "performance/*.cpp")
 
-compile_all("true" "decimal" "Number Systems/static/integer/decimal/decimal/api" "${API_SRC}")
-compile_all("true" "decimal" "Number Systems/static/integer/decimal/decimal/conversion" "${CONVERSION_SRC}")
-compile_all("true" "decimal" "Number Systems/static/integer/decimal/decimal/logic" "${LOGIC_SRC}")
-compile_all("true" "decimal" "Number Systems/static/integer/decimal/decimal/arithmetic" "${ARITHMETIC_SRC}")
-compile_all("true" "decimal" "Number Systems/static/integer/decimal/decimal/math" "${MATH_SRC}")
-compile_all("true" "decimal" "Number Systems/static/integer/decimal/decimal/performance" "${PERFORMANCE_SRC}")
+compile_all("true" "dint" "Number Systems/static/integer/decimal/integer/api" "${API_SRC}")
+compile_all("true" "dint" "Number Systems/static/integer/decimal/integer/conversion" "${CONVERSION_SRC}")
+compile_all("true" "dint" "Number Systems/static/integer/decimal/integer/logic" "${LOGIC_SRC}")
+compile_all("true" "dint" "Number Systems/static/integer/decimal/integer/arithmetic" "${ARITHMETIC_SRC}")
+compile_all("true" "dint" "Number Systems/static/integer/decimal/integer/math" "${MATH_SRC}")
+compile_all("true" "dint" "Number Systems/static/integer/decimal/integer/performance" "${PERFORMANCE_SRC}")