Refinements to project conventions

cppsm · Sep 23, 2019 · 637607e · 637607e
1 parent 8812807
commit 637607e
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 1 deletion.
diff --git a/.cppsm/travis-ci b/.cppsm/travis-ci
@@ -21,6 +21,28 @@ CXX='' CC='' cppsm test
 
 cd ..
 
+# add_subdirectory test
+
+mkdir -p subdir/hello && cd "$_"
+
+git init
+cppsm init-hello
+
+cd ..
+cat << EOF > CMakeLists.txt
+cmake_minimum_required(VERSION 3.10)
+project(subdir_test)
+add_subdirectory(hello)
+EOF
+
+mkdir .build && cd "$_"
+cmake ..
+cmake --build .
+
+if [ -n "$(find . -name "message_test*")" ]; then exit 1; fi
+
+cd ../..
+
 # self test
 
 mkdir hello && cd "$_"

diff --git a/commands/setup b/commands/setup
@@ -44,7 +44,7 @@ cmake-help-contains() {
 
 # Generate ---------------------------------------------------------------------
 
-GENERATE_CMD=(cmake "-Werror=dev" "-Werror=deprecated" "-DCPPSM=1")
+GENERATE_CMD=(cmake "-Werror=dev" "-Werror=deprecated")
 BUILD_DIR=".build"
 
 # Compiler