Fix ch 14, r 4 for TC pass

1. Symlink where possible 2. Use TARGET_FILE for tests
Lincong-pro · Aug 9, 2018 · 82d4461 · 82d4461
1 parent 6f633bc
commit 82d4461
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 21 deletions.
diff --git a/chapter-14/recipe-02/cxx-example/CTestConfig.cmake b/chapter-14/recipe-02/cxx-example/CTestConfig.cmake
diff --git a/chapter-14/recipe-02/cxx-example/CTestConfig.cmake b/chapter-14/recipe-02/cxx-example/CTestConfig.cmake
@@ -0,0 +1 @@
+../../recipe-01/cxx-example/CTestConfig.cmake
diff --git a/chapter-14/recipe-03/cxx-example/CTestConfig.cmake b/chapter-14/recipe-03/cxx-example/CTestConfig.cmake
diff --git a/chapter-14/recipe-03/cxx-example/CTestConfig.cmake b/chapter-14/recipe-03/cxx-example/CTestConfig.cmake
@@ -0,0 +1 @@
+../../recipe-01/cxx-example/CTestConfig.cmake
diff --git a/chapter-14/recipe-03/fortran-example/CTestConfig.cmake b/chapter-14/recipe-03/fortran-example/CTestConfig.cmake
@@ -1 +1 @@
-../cxx-example/CTestConfig.cmake
+../../recipe-01/cxx-example/CTestConfig.cmake
diff --git a/chapter-14/recipe-04/cxx-example/CMakeLists.txt b/chapter-14/recipe-04/cxx-example/CMakeLists.txt
@@ -12,8 +12,7 @@ find_package(Threads REQUIRED)
 
 add_executable(example example.cpp)
 
-target_link_libraries(
-  example
+target_link_libraries(example
   PUBLIC
     Threads::Threads
   )
@@ -22,13 +21,12 @@ option(ENABLE_TSAN "Enable ThreadSanitizer" OFF)
 
 if(ENABLE_TSAN)
   if(CMAKE_CXX_COMPILER_ID MATCHES GNU)
-    target_compile_options(
-      example
+    message(STATUS "ThreadSanitizer enabled")
+    target_compile_options(example
       PUBLIC
         -g -O1 -fsanitize=thread -fno-omit-frame-pointer -fPIC
       )
-    target_link_libraries(
-      example
+    target_link_libraries(example
       PUBLIC
         tsan
       )
@@ -46,5 +44,5 @@ add_test(
   NAME
     example
   COMMAND
-    ${PROJECT_BINARY_DIR}/example
+    $<TARGET_FILE:example>
   )
diff --git a/chapter-14/recipe-04/cxx-example/CTestConfig.cmake b/chapter-14/recipe-04/cxx-example/CTestConfig.cmake
diff --git a/chapter-14/recipe-04/cxx-example/CTestConfig.cmake b/chapter-14/recipe-04/cxx-example/CTestConfig.cmake
@@ -0,0 +1 @@
+../../recipe-01/cxx-example/CTestConfig.cmake
diff --git a/chapter-14/recipe-04/cxx-example/dashboard.cmake b/chapter-14/recipe-04/cxx-example/dashboard.cmake
@@ -1,5 +1,6 @@
 set(CTEST_PROJECT_NAME "example")
-set(CTEST_SITE "localhost")
+cmake_host_system_information(RESULT _site QUERY HOSTNAME)
+set(CTEST_SITE ${_site})
 set(CTEST_BUILD_NAME "${CMAKE_SYSTEM_NAME}-${CMAKE_HOST_SYSTEM_PROCESSOR}")
 
 set(CTEST_SOURCE_DIRECTORY "${CTEST_SCRIPT_DIRECTORY}")
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../cxx-example/CTestConfig.cmake
		../../recipe-01/cxx-example/CTestConfig.cmake