finish "step4":exercise 1

Author: YuZhen-Yang

Step4/CMakeLists.txt

@@ -1,11 +1,12 @@
 cmake_minimum_required(VERSION 3.23)
 
 project(Tutorial)
-
+# set(CMAKE_CXX_COMPILER g++-13)
 option(TUTORIAL_BUILD_UTILITIES "Build the Tutorial executable" ON)
 
 # TODO1: Add a default-OFF option named TUTORIAL_USE_STD_SQRT, with a doc
 #        string of "Use std::sqrt"
+option(TUTORIAL_USE_STD_SQRT "Use std::sqrt" OFF)
 
 if(TUTORIAL_BUILD_UTILITIES)
   add_subdirectory(Tutorial)

Step4/CMakePresets.json

@@ -7,9 +7,10 @@
       "description": "Preset to use with the tutorial",
       "binaryDir": "${sourceDir}/build",
       "cacheVariables": {
-        "TODO7": "Remove the CMAKE_CXX_STANDARD (and this TODO)",
-        "CMAKE_CXX_STANDARD": "20",
-        "TODO8": "Set TUTORIAL_USE_STD_SQRT to ON"
+        "CMAKE_CXX_COMPILER":"g++-13",
+        "CMAKE_EXPORT_COMPILE_COMMANDS":"ON",
+
+        "TUTORIAL_USE_STD_SQRT": "ON"
       }
     }
   ]

Step4/MathFunctions/CMakeLists.txt

@@ -2,15 +2,22 @@ add_library(MathFunctions)
 
 target_sources(MathFunctions
   PRIVATE
-    MathFunctions.cxx
+  MathFunctions.cxx
 
   PUBLIC
-    FILE_SET HEADERS
-    FILES
-      MathFunctions.h
+  FILE_SET HEADERS
+  FILES
+  MathFunctions.h
 )
 
 # TODO2: Add a compile feature for C++20 support to MathFunctions
+target_compile_features(MathFunctions PRIVATE cxx_std_20)
 
 # TODO3: Add a conditional which checks TUTORIAL_USE_STD_SQRT and if
 #        ON, set a compile definition on MathFunctions of the same name
+if(TUTORIAL_USE_STD_SQRT)
+  target_compile_definitions(MathFunctions
+    PRIVATE
+    TUTORIAL_USE_STD_SQRT
+  )
+endif()

Step4/MathFunctions/MathFunctions.cxx

@@ -1,4 +1,5 @@
 // TODO5: Include <cmath>
+#include <cmath>
 
 #include <format>
 #include <iostream>
@@ -32,7 +33,10 @@ double sqrt(double x)
 {
   // TODO6: Check if TUTORIAL_USE_STD_SQRT is defined, if so use std::sqrt
   //        instead of mysqrt
-
+#ifdef TUTORIAL_USE_STD_SQRT
+  return std::sqrt(x);
+#else
   return mysqrt(x);
+#endif 
 }
 }

Step4/Tutorial/CMakeLists.txt

@@ -13,6 +13,7 @@ target_link_libraries(Tutorial
 )
 
 # TODO4: Add a compile feature for C++20 support to Tutorial
+target_compile_features(Tutorial PRIVATE cxx_std_20)
 
 
 if(