diff options
| author | cxong <congusbongus@gmail.com> | 2016-04-02 07:05:52 +0300 |
|---|---|---|
| committer | cxong <congusbongus@gmail.com> | 2016-04-02 07:05:52 +0300 |
| commit | 3bffa82a0a65472b8ac1c6c2d03acb907278706d (patch) | |
| tree | ef1cc14b2d43f22046ecf0e2567f21fde82d3b6c /samples | |
| parent | b37e3931157b9f1a8ab526164b7a2dc8edea88b2 (diff) | |
Remove root .gitignore; include cpp_sample in CMakeLists
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/.gitignore | 39 | ||||
| -rw-r--r-- | samples/CMakeLists.txt | 7 |
2 files changed, 43 insertions, 3 deletions
diff --git a/samples/.gitignore b/samples/.gitignore index 378eac2..a74f38d 100644 --- a/samples/.gitignore +++ b/samples/.gitignore @@ -1 +1,38 @@ -build +# Object files +*.o + +# Libraries +*.lib +*.a + +# Shared objects (inc. Windows DLLs) +*.dll +*.so +*.so.* +*.dylib + +# Executables +*.exe +*.out +*.app +*_sample + +# CMake +CMakeFiles/ +CMakeCache.txt +*.dir/ +cmake_install.cmake + +# Visual Studio +Debug/ +Win32/ +*.opensdf +*.sdf +*.suo +*.vcxproj.user +*.vcxproj +*.vcxproj.filters +*.sln + +# Linux +Makefile diff --git a/samples/CMakeLists.txt b/samples/CMakeLists.txt index 65b6a42..4839a0a 100644 --- a/samples/CMakeLists.txt +++ b/samples/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.6 FATAL_ERROR) cmake_policy(VERSION 2.6) -project(tinydir C) +project(tinydir) INCLUDE_DIRECTORIES(..) @@ -11,7 +11,9 @@ INCLUDE_DIRECTORIES(..) if(MSVC) add_definitions(-W4 -WX) else() - add_definitions(-fsigned-char -Wall -W -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Winline -Werror) + add_definitions(-fsigned-char -Wall -W -Wshadow -Wpointer-arith -Wcast-qual -Winline -Werror) + set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -Wstrict-prototypes") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") endif() ################################ @@ -20,3 +22,4 @@ add_executable(file_open_sample file_open_sample.c) add_executable(iterate_sample iterate_sample.c) add_executable(random_access_sample random_access_sample.c) add_executable(interactive_sample interactive_sample.c) +add_executable(cpp_sample cpp_sample.cpp) |