[C] Renamed include dir to lib

This commit is contained in:
seleznevae 2018-05-06 16:50:08 +03:00
parent ac54041501
commit 9daee298b0
4 changed files with 9 additions and 4 deletions

View File

@ -32,7 +32,7 @@ add_definitions(-DFT_CONGIG_HAVE_WCHAR)
# Includes # Includes
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
include_directories(include) include_directories(lib)
include_directories(src) include_directories(src)
include_directories(tests) include_directories(tests)
@ -59,7 +59,7 @@ endif("${FORT_COMPILER}" STREQUAL "MSVC")
# Sources and executables # Sources and executables
# ------------------------------------------------------------------------------ # ------------------------------------------------------------------------------
FILE(GLOB_RECURSE FortHeaders "include/*.h" "include/*.hpp" "tests/*.h" "src/*.h") FILE(GLOB_RECURSE FortHeaders "lib/*.h" "lib/*.hpp" "tests/*.h" "src/*.h")
add_custom_target(headers SOURCES ${FortHeaders}) add_custom_target(headers SOURCES ${FortHeaders})
@ -114,7 +114,7 @@ set(TEST_SOURCES
tests/bb_tests/test_memory_errors.c tests/bb_tests/test_memory_errors.c
tests/test_utils.c) tests/test_utils.c)
add_executable(${PROJECT_NAME}_test add_executable(${PROJECT_NAME}_test
include/fort.c lib/fort.c
${TEST_SOURCES}) ${TEST_SOURCES})
@ -210,9 +210,14 @@ if(FORT_ENABLE_ASTYLE)
--convert-tabs --convert-tabs
--min-conditional-indent=0 --min-conditional-indent=0
--indent=spaces=4 --indent=spaces=4
${CMAKE_SOURCE_DIR}/include/*.h ${CMAKE_SOURCE_DIR}/lib/*.h
${CMAKE_SOURCE_DIR}/lib/*.c
${CMAKE_SOURCE_DIR}/src/*.h
${CMAKE_SOURCE_DIR}/src/*.c ${CMAKE_SOURCE_DIR}/src/*.c
${CMAKE_SOURCE_DIR}/tests/*.c ${CMAKE_SOURCE_DIR}/tests/*.c
${CMAKE_SOURCE_DIR}/tests/*.h
${CMAKE_SOURCE_DIR}/tests/bb_tests/*.c
${CMAKE_SOURCE_DIR}/tests/wb_tests/*.c
) )
if(NOT WIN32 STREQUAL "1") if(NOT WIN32 STREQUAL "1")