Minor revisions for ch 7, r 4

dev-cafe · May 31, 2018 · e01a8e0 · e01a8e0
1 parent 21c9121
commit e01a8e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 9 deletions.
diff --git a/chapter-07/recipe-04/cxx-example/CMakeLists.txt b/chapter-07/recipe-04/cxx-example/CMakeLists.txt
@@ -6,15 +6,12 @@ set(CMAKE_CXX_STANDARD 11)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
 
 include(GNUInstallDirs)
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY
-    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY
-    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY
-    ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/${CMAKE_INSTALL_BINDIR})
 
 add_subdirectory(src)
 

diff --git a/chapter-07/recipe-04/cxx-example/cmake/testing.cmake b/chapter-07/recipe-04/cxx-example/cmake/testing.cmake
@@ -1,5 +1,3 @@
-include(CMakeParseArguments)
-
 function(add_catch_test)
   set(options)
   set(oneValueArgs NAME COST)