Clean up a few spots

Author: ibab

cmake/template_src.txt

@@ -1,15 +1,17 @@
 
 # Specify .cpp files
+set(TARGET_NAME {{project_name}})
 set(SRC hello.cpp)
 
-# Specify the executable
-add_executable({{project_name}}-bin main.cpp ${SRC})
-target_link_libraries({{project_name}}-bin ${LIBRARIES})
-set_target_properties({{project_name}}-bin PROPERTIES OUTPUT_NAME {{project_name}})
+# Build an executable from main.cpp and all specified source files
+add_executable(${TARGET_NAME} main.cpp ${SRC})
+target_link_libraries(${TARGET_NAME} ${LIBRARIES})
 
-# Build a library
-add_library({{project_name}} ${SRC})
-target_link_libraries({{project_name}} ${LIBRARIES})
+# Build a library from all specified source files
+# This is required for using googletest
+add_library(${TARGET_NAME}-lib ${SRC})
+target_link_libraries(${TARGET_NAME}-lib ${LIBRARIES})
+set_target_properties(${TARGET_NAME}-lib PROPERTIES OUTPUT_NAME {{project_name}})
 
 # vim:ft=cmake
 

cmake/template_test.txt

@@ -1,6 +1,6 @@
 include(ExternalProject)
 
-set(TARGET {{project_name}})
+set(TARGET {{project_name}}-lib)
 set(GTEST_TARGET ${TARGET}_test)
 file(GLOB_RECURSE TESTS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
 

src/hello.cpp

@@ -9,6 +9,9 @@ void hello() {
 }
 
 std::string get_message() {
+    // There's a mistake here
+    // Try running `make check` and observe the failing test case
+    // Then correct the line below and repeat
     return "Hellx, World!";
 }