Skip to content

Commit 0ad97f5

Browse files
committed
#170 fixed format for CMakeLists.txt
1 parent 5fd62cd commit 0ad97f5

File tree

3 files changed

+52
-50
lines changed

3 files changed

+52
-50
lines changed

CMakeLists.txt

Lines changed: 39 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,39 @@
1-
cmake_minimum_required (VERSION 3.0)
2-
3-
option(BUILD_TESTING "Build tests" ON)
4-
5-
if (WIN32)
6-
set(CMAKE_CXX_STANDARD_LIBRARIES "-static-libgcc -static-libstdc++ ${CMAKE_CXX_STANDARD_LIBRARIES}")
7-
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive")
8-
endif (WIN32)
9-
10-
set(CMAKE_AUTOMOC ON)
11-
set(CMAKE_AUTORCC ON)
12-
set(CMAKE_AUTOUIC ON)
13-
14-
find_package(Qt5 COMPONENTS Core Gui Widgets REQUIRED)
15-
16-
project(fva)
17-
18-
add_subdirectory(src)
19-
20-
# Enable testing for the project
21-
if(BUILD_TESTING)
22-
23-
# Add GoogleTest as a subdirectory.
24-
add_subdirectory(googletest)
25-
26-
enable_testing()
27-
add_subdirectory(tests)
28-
endif()
29-
30-
31-
# Code coverage
32-
if(ENABLE_COVERAGE)
33-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g -fprofile-arcs -ftest-coverage")
34-
message("Code coverage is enabled and provided with GCC.")
35-
endif()
1+
cmake_minimum_required(VERSION 3.0)
2+
3+
option(BUILD_TESTING "Build tests" ON)
4+
5+
if (WIN32)
6+
set(CMAKE_CXX_STANDARD_LIBRARIES
7+
"-static-libgcc -static-libstdc++ ${CMAKE_CXX_STANDARD_LIBRARIES}")
8+
set(CMAKE_EXE_LINKER_FLAGS
9+
"${CMAKE_EXE_LINKER_FLAGS} -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive")
10+
endif (WIN32)
11+
12+
set(CMAKE_AUTOMOC ON)
13+
set(CMAKE_AUTORCC ON)
14+
set(CMAKE_AUTOUIC ON)
15+
16+
find_package(
17+
Qt5
18+
COMPONENTS Core Gui Widgets
19+
REQUIRED)
20+
21+
project(fva)
22+
23+
add_subdirectory(src)
24+
25+
# Enable testing for the project
26+
if (BUILD_TESTING)
27+
28+
# Add GoogleTest as a subdirectory.
29+
add_subdirectory(googletest)
30+
31+
enable_testing()
32+
add_subdirectory(tests)
33+
endif ()
34+
35+
# Code coverage
36+
if (ENABLE_COVERAGE)
37+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -g -fprofile-arcs -ftest-coverage")
38+
message("Code coverage is enabled and provided with GCC.")
39+
endif ()

src/CMakeLists.txt

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
add_subdirectory(viewer)
2-
add_subdirectory(player)
3-
add_subdirectory(organizer)
4-
add_subdirectory(organizerwizard)
5-
add_subdirectory(flowcontroller)
6-
add_subdirectory(dictionaryeditor)
7-
add_subdirectory(descriptioneditor)
8-
add_subdirectory(dataprocessor)
9-
add_subdirectory(configurator)
10-
add_subdirectory(commonlib)
1+
add_subdirectory(viewer)
2+
add_subdirectory(player)
3+
add_subdirectory(organizer)
4+
add_subdirectory(organizerwizard)
5+
add_subdirectory(flowcontroller)
6+
add_subdirectory(dictionaryeditor)
7+
add_subdirectory(descriptioneditor)
8+
add_subdirectory(dataprocessor)
9+
add_subdirectory(configurator)
10+
add_subdirectory(commonlib)

tests/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
add_subdirectory(unit)
2-
#TODO: fix the UI tests
3-
#add_subdirectory(ui)
4-
#TODO : fix the integration tests
5-
#add_subdirectory(integration)
1+
add_subdirectory(unit)
2+
# TODO: fix the UI tests add_subdirectory(ui) TODO : fix the integration tests
3+
# add_subdirectory(integration)

0 commit comments

Comments
 (0)