Merge remote-tracking branch 'origin/master'

This commit is contained in:
Johannes Theiner 2018-08-28 09:24:26 +02:00
commit cfeaa39e8a
2 changed files with 10 additions and 1 deletions

5
.gitignore vendored
View File

@ -4,3 +4,8 @@ cmake-build-debug
*~ *~
*.out *.out
*.save *.save
/bin
/CMakeFiles
CMakeCache.txt
cmake_install.cmake
Makefile

View File

@ -3,6 +3,10 @@ project(C/C++)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14")
# These are the corresponding output paths
set (EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/bin)
set (LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH})
add_executable(01_ENV_MP 01_ENV/MP/main.c 01_ENV/MP/func1.c) add_executable(01_ENV_MP 01_ENV/MP/main.c 01_ENV/MP/func1.c)
target_link_libraries(01_ENV_MP m) target_link_libraries(01_ENV_MP m)
add_executable(01_ENV_Testat 01_ENV/Testat/main.c 01_ENV/Testat/func1.c) add_executable(01_ENV_Testat 01_ENV/Testat/main.c 01_ENV/Testat/func1.c)