Skip to content

Commit 637607e

Browse files
committed
Refinements to project conventions
1 parent 8812807 commit 637607e

File tree

2 files changed

+23
-1
lines changed

2 files changed

+23
-1
lines changed

.cppsm/travis-ci

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,28 @@ CXX='' CC='' cppsm test
2121

2222
cd ..
2323

24+
# add_subdirectory test
25+
26+
mkdir -p subdir/hello && cd "$_"
27+
28+
git init
29+
cppsm init-hello
30+
31+
cd ..
32+
cat << EOF > CMakeLists.txt
33+
cmake_minimum_required(VERSION 3.10)
34+
project(subdir_test)
35+
add_subdirectory(hello)
36+
EOF
37+
38+
mkdir .build && cd "$_"
39+
cmake ..
40+
cmake --build .
41+
42+
if [ -n "$(find . -name "message_test*")" ]; then exit 1; fi
43+
44+
cd ../..
45+
2446
# self test
2547

2648
mkdir hello && cd "$_"

commands/setup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ cmake-help-contains() {
4444

4545
# Generate ---------------------------------------------------------------------
4646

47-
GENERATE_CMD=(cmake "-Werror=dev" "-Werror=deprecated" "-DCPPSM=1")
47+
GENERATE_CMD=(cmake "-Werror=dev" "-Werror=deprecated")
4848
BUILD_DIR=".build"
4949

5050
# Compiler

0 commit comments

Comments
 (0)