3rd-party/libfort
1
0
Fork 0
Code Releases Activity

[C] Improved cmake files consistency

Browse Source
This commit is contained in:
seleznevae 2019-05-19 19:09:11 +03:00
parent e77e262a48
commit f223a12fed
7 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.cirrus.yml
View File

@ -27,7 +27,7 @@ main_task:
# Test build without optimizations and with asan # Test build without optimizations and with asan
- mkdir -p build - mkdir -p build
- cd build - cd build
- cmake .. -DFORT_BUILD_TYPE=asan - cmake .. -DFORT_BUILD_TYPE=asan -DCMAKE_BUILD_TYPE=Debug
- cmake --build . --target all - cmake --build . --target all
- ls - ls
- ctest -VV - ctest -VV
@ -37,7 +37,7 @@ main_task:
# Test build without optimizations and with ubsan # Test build without optimizations and with ubsan
- mkdir -p build - mkdir -p build
- cd build - cd build
- cmake .. -DFORT_BUILD_TYPE=ubsan - cmake .. -DFORT_BUILD_TYPE=ubsan -DCMAKE_BUILD_TYPE=Debug
- cmake --build . --target all - cmake --build . --target all
- ls - ls
- ctest -VV - ctest -VV
@ -47,7 +47,7 @@ main_task:
# Test without WCHAR support # Test without WCHAR support
- mkdir -p build - mkdir -p build
- cd build - cd build
- cmake .. -DFORT_ENABLE_WCHAR=OFF - cmake .. -DFORT_ENABLE_WCHAR=OFF -DCMAKE_BUILD_TYPE=Debug
- cmake --build . --target all - cmake --build . --target all
- ls - ls
- ctest -VV - ctest -VV

8
.travis.yml
View File

@ -191,7 +191,7 @@ script:
# Test build without optimizations and with asan # Test build without optimizations and with asan
- mkdir -p build - mkdir -p build
- cd build - cd build
- cmake .. -DFORT_BUILD_TYPE=asan - cmake .. -DFORT_BUILD_TYPE=asan -DCMAKE_BUILD_TYPE=Debug
- cmake --build . --target all - cmake --build . --target all
- ls - ls
- ctest -VV - ctest -VV
@ -201,7 +201,7 @@ script:
- rm -r build/* - rm -r build/*
- mkdir -p build - mkdir -p build
- cd build - cd build
- cmake .. -DFORT_ENABLE_WCHAR=OFF - cmake .. -DFORT_ENABLE_WCHAR=OFF -DCMAKE_BUILD_TYPE=Debug
- cmake --build . --target all - cmake --build . --target all
- ls - ls
- ctest -VV - ctest -VV
@ -212,7 +212,7 @@ script:
cd .. ; cd .. ;
rm -r build/* ; rm -r build/* ;
cd build ; cd build ;
cmake .. -DFORT_BUILD_TYPE=ubsan ; cmake .. -DFORT_BUILD_TYPE=ubsan -DCMAKE_BUILD_TYPE=Debug ;
cmake --build . --target all ; cmake --build . --target all ;
ls ; ls ;
ctest -VV; ctest -VV;
@ -258,7 +258,7 @@ script:
cd .. ; cd .. ;
rm -r build/* ; rm -r build/* ;
cd build ; cd build ;
cmake .. -DFORT_BUILD_TYPE=coveralls ; cmake .. -DFORT_BUILD_TYPE=coveralls -DCMAKE_BUILD_TYPE=Debug ;
cmake --build . --target all ; cmake --build . --target all ;
ls ; ls ;
./tests/libfort_test_dev ; ./tests/libfort_test_dev ;

8
CMakeLists.txt
View File

@ -27,6 +27,10 @@ endif()
set(CMAKE_VERBOSE_MAKEFILE ON) set(CMAKE_VERBOSE_MAKEFILE ON)
message(STATUS "libfort build options: "
" wchar support = ${FORT_ENABLE_WCHAR}; "
" build type = ${FORT_BUILD_TYPE}")
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
# Warnings # Warnings
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
@ -59,8 +63,8 @@ else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ADDITIONAL_WARNINGS} -Wpedantic") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ADDITIONAL_WARNINGS} -Wpedantic")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ADDITIONAL_WARNINGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ADDITIONAL_WARNINGS}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -std=c99 ") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 ")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -std=c++11") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
endif() endif()
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------

2
appveyor.yml
View File

@ -14,7 +14,7 @@ install:
before_build: before_build:
- mkdir build - mkdir build
- cd build - cd build
- cmake -G "Visual Studio 15 2017 Win64" .. - cmake -DCMAKE_BUILD_TYPE=Debug --G "Visual Studio 15 2017 Win64" ..
- dir - dir
build: build:

1
lib/CMakeLists.txt
View File

@ -1,6 +1,5 @@
option(FORT_HAVE_WCHAR "Enable wchar support" ON) option(FORT_HAVE_WCHAR "Enable wchar support" ON)
message("FORT_HAVE_WCHAR in fort = ${FORT_HAVE_WCHAR}")
add_library(fort add_library(fort
fort.c) fort.c)

1
src/CMakeLists.txt
View File

@ -1,7 +1,6 @@
option(FORT_HAVE_WCHAR "Enable wchar support" ON) option(FORT_HAVE_WCHAR "Enable wchar support" ON)
option(FORT_TEST_BUILD "Export some internal symbols for tests" ON) option(FORT_TEST_BUILD "Export some internal symbols for tests" ON)
message("FORT_HAVE_WCHAR in fort_dev = ${FORT_HAVE_WCHAR}")
add_library(fort_dev add_library(fort_dev
fort_impl.c fort_impl.c
vector.c vector.c

1
tests/CMakeLists.txt
View File

@ -1,7 +1,6 @@
option(FORT_HAVE_WCHAR "Enable wchar support" ON) option(FORT_HAVE_WCHAR "Enable wchar support" ON)
option(FORT_TEST_BUILD "Export some internal symbols for tests" ON) option(FORT_TEST_BUILD "Export some internal symbols for tests" ON)
message("FORT_HAVE_WCHAR in tests = ${FORT_HAVE_WCHAR}")
add_executable(${PROJECT_NAME}_test_dev add_executable(${PROJECT_NAME}_test_dev
main_test.c main_test.c