Address comments from editor and reviewer

- Fix naming of recipe 5 and 6 to reflect the one used in the text
- Text and source code are in sync

README.md

@@ -25,8 +25,8 @@
 - [Switching Generators](chapter-01/recipe-02/README.md)
 - [Building and Linking Static and Shared Libraries](chapter-01/recipe-03/README.md)
 - [Controlling Compilation with Conditionals](chapter-01/recipe-04/README.md)
-- [How to Present Options to the User](chapter-01/recipe-05/README.md)
-- [How to Specify the Compiler](chapter-01/recipe-06/README.md)
+- [Presenting Options to the User](chapter-01/recipe-05/README.md)
+- [Specifying the Compiler](chapter-01/recipe-06/README.md)
 - [Switching the Build Type](chapter-01/recipe-07/README.md)
 - [Controlling Compiler Flags](chapter-01/recipe-08/README.md)
 - [Setting the Standard for the Language](chapter-01/recipe-09/README.md)

chapter-01/README.md

@@ -4,8 +4,8 @@
 - [Switching Generators](recipe-02/README.md)
 - [Building and Linking Static and Shared Libraries](recipe-03/README.md)
 - [Controlling Compilation with Conditionals](recipe-04/README.md)
-- [How to Present Options to the User](recipe-05/README.md)
-- [How to Specify the Compiler](recipe-06/README.md)
+- [Presenting Options to the User](recipe-05/README.md)
+- [Specifying the Compiler](recipe-06/README.md)
 - [Switching the Build Type](recipe-07/README.md)
 - [Controlling Compiler Flags](recipe-08/README.md)
 - [Setting the Standard for the Language](recipe-09/README.md)

chapter-01/recipe-03/cxx-example/CMakeLists.txt

@@ -5,8 +5,11 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 project(recipe-03 LANGUAGES CXX)
 
 # generate a library from sources
-set(_sources Message.hpp Message.cpp)
-add_library(message STATIC ${_sources})
+add_library(message
+  STATIC
+    Message.hpp
+    Message.cpp
+  )
 
 add_executable(hello-world hello-world.cpp)
 

chapter-01/recipe-03/cxx-objlib-example/CMakeLists.txt

@@ -5,8 +5,11 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 project(recipe-03 LANGUAGES CXX)
 
 # generate an object library from sources
-set(_sources Message.hpp Message.cpp)
-add_library(message-objs OBJECT ${_sources})
+add_library(message-objs
+  OBJECT
+    Message.hpp
+    Message.cpp
+  )
 # This is only needed for older compilers, but doesn't hurt either to have it
 set_target_properties(message-objs PROPERTIES POSITION_INDEPENDENT_CODE 1)
 

chapter-01/recipe-04/cxx-example/CMakeLists.txt

@@ -5,7 +5,7 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 project(recipe-04 LANGUAGES CXX)
 
 # list sources
-set(_sources Message.hpp Message.cpp)
+list(APPEND _sources Message.hpp Message.cpp)
 
 # introduce a toggle for using a library
 set(USE_LIBRARY OFF)

chapter-01/recipe-05/README.md

@@ -1,4 +1,4 @@
-# How to Present Options to the User
+# Presenting Options to the User
 
 Abstract to be written ...
 

chapter-01/recipe-05/cxx-example/CMakeLists.txt

@@ -18,7 +18,7 @@ cmake_dependent_option(MAKE_SHARED_LIBRARY "Compile sources into a shared librar
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
 # list sources
-set(_sources Message.hpp Message.cpp)
+list(APPEND _sources Message.hpp Message.cpp)
 
 message(STATUS "Compile sources into a library? ${USE_LIBRARY}")
 

chapter-01/recipe-05/title.txt

@@ -1 +1 @@
-How to Present Options to the User
+Presenting Options to the User

chapter-01/recipe-06/README.md

@@ -1,4 +1,4 @@
-# How to Specify the Compiler
+# Specifying the Compiler
 
 Abstract to be written ...
 

chapter-01/recipe-06/title.txt

@@ -1 +1 @@
-How to Specify the Compiler
+Specifying the Compiler

chapter-01/recipe-07/cxx-example/CMakeLists.txt

@@ -10,17 +10,16 @@ message("C++ compiler flags, release mode: ${CMAKE_CXX_FLAGS_RELEASE}")
 message("C++ compiler flags, release with debug info mode: ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
 message("C++ compiler flags, minimal release mode: ${CMAKE_CXX_FLAGS_MINSIZEREL}")
 
-add_library(
-  geometry
+add_library(geometry
   STATIC
-  geometry_circle.cpp
-  geometry_circle.hpp
-  geometry_polygon.cpp
-  geometry_polygon.hpp
-  geometry_rhombus.cpp
-  geometry_rhombus.hpp
-  geometry_square.cpp
-  geometry_square.hpp
+    geometry_circle.cpp
+    geometry_circle.hpp
+    geometry_polygon.cpp
+    geometry_polygon.hpp
+    geometry_rhombus.cpp
+    geometry_rhombus.hpp
+    geometry_square.cpp
+    geometry_square.hpp
   )
 
 add_executable(compute-areas compute-areas.cpp)

chapter-01/recipe-08/cxx-example/CMakeLists.txt

@@ -6,24 +6,21 @@ project(recipe-08 LANGUAGES CXX)
 
 message("C++ compiler flags: ${CMAKE_CXX_FLAGS}")
 
-set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-
 list(APPEND flags "-fPIC" "-Wall")
 if(NOT WIN32)
   list(APPEND flags "-Wextra" "-Wpedantic")
 endif()
 
-add_library(
-  geometry
+add_library(geometry
   STATIC
-  geometry_circle.cpp
-  geometry_circle.hpp
-  geometry_polygon.cpp
-  geometry_polygon.hpp
-  geometry_rhombus.cpp
-  geometry_rhombus.hpp
-  geometry_square.cpp
-  geometry_square.hpp
+    geometry_circle.cpp
+    geometry_circle.hpp
+    geometry_polygon.cpp
+    geometry_polygon.hpp
+    geometry_rhombus.cpp
+    geometry_rhombus.hpp
+    geometry_square.cpp
+    geometry_square.hpp
   )
 
 target_compile_options(geometry

chapter-01/recipe-09/cxx-example/CMakeLists.txt

@@ -6,14 +6,15 @@ project(recipe-09 LANGUAGES CXX)
 
 set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 
-add_library(animals SHARED
-  Animal.cpp
-  Animal.hpp
-  Cat.cpp
-  Cat.hpp
-  Dog.cpp
-  Dog.hpp
-  Factory.hpp
+add_library(animals
+  SHARED
+    Animal.cpp
+    Animal.hpp
+    Cat.cpp
+    Cat.hpp
+    Dog.cpp
+    Dog.hpp
+    Factory.hpp
   )
 set_target_properties(animals
   PROPERTIES

chapter-01/recipe-10/cxx-example/CMakeLists.txt

@@ -4,19 +4,16 @@ cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 # project name and language
 project(recipe-10 LANGUAGES CXX)
 
-add_executable(compute-areas compute-areas.cpp)
-
-add_library(
-  geometry
+add_library(geometry
   STATIC
-  geometry_circle.cpp
-  geometry_circle.hpp
-  geometry_polygon.cpp
-  geometry_polygon.hpp
-  geometry_rhombus.cpp
-  geometry_rhombus.hpp
-  geometry_square.cpp
-  geometry_square.hpp
+    geometry_circle.cpp
+    geometry_circle.hpp
+    geometry_polygon.cpp
+    geometry_polygon.hpp
+    geometry_rhombus.cpp
+    geometry_rhombus.hpp
+    geometry_square.cpp
+    geometry_square.hpp
   )
 
 # we wish to compile the library with the optimization flag: -O3
@@ -42,4 +39,5 @@ foreach(_source ${sources_with_lower_optimization})
   message(STATUS "Source ${_source} has the following extra COMPILE_FLAGS: ${_flags}")
 endforeach()
 
+add_executable(compute-areas compute-areas.cpp)
 target_link_libraries(compute-areas geometry)