diff --git a/01-basic/I-compiling-with-clang/README.adoc b/01-basic/I-compiling-with-clang/README.adoc index daca8f9..16d4044 100644 --- a/01-basic/I-compiling-with-clang/README.adoc +++ b/01-basic/I-compiling-with-clang/README.adoc @@ -6,9 +6,9 @@ toc::[] # Introduction -When building with CMake, it is possible to set the C and C++ compiler. This example -is the same as the link:../A-hello-cmake[hello-cmake] example exccept shows the most basic -method of changing the compiler from the default gcc to clang. +When building with CMake it is possible to set the C and C++ compiler. This example +is the same as the link:../A-hello-cmake[hello-cmake] example except that it shows the most basic +method of changing the compiler from the default gcc to http://clang.llvm.org/[clang]. The files in this tutorial are below: diff --git a/01-basic/README.adoc b/01-basic/README.adoc index 18b751b..ab6d65d 100644 --- a/01-basic/README.adoc +++ b/01-basic/README.adoc @@ -6,10 +6,12 @@ set compile flags, create and link executables and libraries, and install them. The examples included are - link:A-hello-cmake[hello-cmake]. A hello world example. - - link:B-hello-headers[hello-headers]. A slighly more complicated hello world example, using seperate source and include folders. + - link:B-hello-headers[hello-headers]. A slightly more complicated hello world example, using seperate source and include folders. - link:C-static-library[static-library]. An example using a static library. - link:D-shared-library[shared-library]. An example using a shared library. - link:E-installing[installing]. Shows how to create a 'make install' target that will install binaries and libraries. - link:F-build-type[build-type]. An example showing how to set a default build and optimization flags for your project. - link:G-compile-flags[compile-flags]. Shows how to set additional compile flags. - link:H-third-party-library[third-party-library]. Shows an example of how to link third party libraries. + - link:I-compiling-with-clang[compiling-with-clang]. An example of invoking the clang compiler. + - link:J-building-with-ninja[building-with-ninja] - Shows how to generate ninja build files diff --git a/README.adoc b/README.adoc index ef917be..410d84b 100644 --- a/README.adoc +++ b/README.adoc @@ -7,8 +7,8 @@ toc::[] # Introduction -https://cmake.org/[CMake] is a cross-platform open-source build system which can build, test and package -software. It can be used to support multiple native build environments including +https://cmake.org/[CMake] is a cross-platform open-source meta-build system which +can build, test and package software. It can be used to support multiple native build environments including make, Apple's xcode and Microsoft Visual Studio. This repository includes some example CMake configurations which I have picked up @@ -51,6 +51,13 @@ Some specific examples may require other tools including: $ sudo apt-get install cppcheck +* http://clang.llvm.org/[clang] + + $ sudo apt-get install clang-3.6 + +* https://ninja-build.org/[ninja] + + $ sudo apt-get install ninja-build # Other Links