Skip to content

Commit 5ba6a04

Browse files
authored
Sanitize folder structure
Make the folder structure less deep, with a `src` folder instead of the awkward `cpp11training` folder. Merge pull request #26 from xtofl/sanitize-folder-structure closes #27
2 parents 00d887f + a376f81 commit 5ba6a04

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+47
-234
lines changed

.travis.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,17 +53,23 @@ matrix:
5353
sources: &sources
5454
- ubuntu-toolchain-r-test
5555

56+
install:
57+
- |
58+
CMAKE_URL="https://cmake.org/files/v3.16/cmake-3.16.2-Linux-x86_64.tar.gz"
59+
mkdir cmake && travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake
60+
export PATH=$(realpath cmake/bin):${PATH}
61+
cmake --version
62+
5663
script:
57-
- cd cpp11training
5864
- mkdir build && cd build
59-
- cmake ..
65+
- cmake ../src
6066
- make
6167
- ./cpp11training
62-
- cd ../..
68+
- cd ..
6369
- cd coupling
6470
- mkdir build && cd build
6571
- cmake ..
6672
- make
6773
- ./coupled_program
68-
- cd ../..
74+
- cd ..
6975

README.md

Lines changed: 3 additions & 6 deletions

cpp11training/cpp11training.sln renamed to cpp11training.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 15
44
VisualStudioVersion = 15.0.26403.7
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp11training", "cpp11training\cpp11training.vcxproj", "{112A7AE9-D86A-4E46-B40B-9D34ADAAC696}"
6+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp11training", "src\cpp11training.vcxproj", "{112A7AE9-D86A-4E46-B40B-9D34ADAAC696}"
77
EndProject
88
Global
99
GlobalSection(SolutionConfigurationPlatforms) = preSolution

cpp11training/CMake/DownloadProject.CMakeLists.cmake.in

Lines changed: 0 additions & 14 deletions
This file was deleted.

cpp11training/CMake/DownloadProject.cmake

Lines changed: 0 additions & 143 deletions
This file was deleted.

cpp11training/CMake/SetupGoogletest.cmake

Lines changed: 0 additions & 60 deletions
This file was deleted.

cpp11training/CMakeLists.txt

Lines changed: 0 additions & 6 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)