diff options
| -rw-r--r-- | CMakeLists.txt | 11 | ||||
| -rw-r--r-- | cli/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 6 |
3 files changed, 3 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index d662262..504b148 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,15 +4,7 @@ project(diceparser) set(QT_REQUIRED_VERSION "5.9.0") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED COMPONENTS Core Test Gui Svg) -#add_subdirectory(irc) -#add_subdirectory(mobile) -#add_subdirectory(webserver) - -# Add cmake extension -#find_package(ECM 5.33.0 CONFIG REQUIRED) -#set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) -#include(ECMAddTests) enable_testing(true) include_directories(${CMAKE_CURRENT_SOURCE_DIR} result node) @@ -65,3 +57,6 @@ target_link_libraries(diceparser PUBLIC Qt5::Core Qt5::Gui Qt5::Svg) add_subdirectory(cli) add_subdirectory( tests ) +#add_subdirectory(irc) +#add_subdirectory(mobile) +#add_subdirectory(webserver) diff --git a/cli/CMakeLists.txt b/cli/CMakeLists.txt index 1c2d537..215287d 100644 --- a/cli/CMakeLists.txt +++ b/cli/CMakeLists.txt @@ -14,7 +14,6 @@ set(CMAKE_AUTOMOC ON) set(EXECUTABLE_OUTPUT_PATH bin/) - # Find the QtWidgets library find_package(Qt5Core) include_directories(${Qt5Core_INCLUDES} ../) @@ -78,5 +77,3 @@ add_executable( dice ${cli_sources} ${dice_QM} ${documentation_files}) target_link_libraries(dice diceparser ${Qt5Core_LIBRARIES} ${Qt5Gui_LIBRARIES} ${Qt5Svg_LIBRARIES}) INSTALL_TARGETS(/bin dice) - -#qt5_use_modules() diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 25df30d..4065cc5 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -1,10 +1,4 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fno-permissive -pedantic -Wall -Wextra") - - -#ecm_add_test(tst_dice.cpp -# TEST_NAME "tst_diceparser" -#LINK_LIBRARIES Qt5::Test Qt5::Widgets Qt5::Qml -#) set(CMAKE_AUTOMOC ON) find_package(Qt5Test REQUIRED) |