X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=9d2428a9e201148c5ef02d7310af70aea6d1243d;hb=0aad432c15b1b3dc4d156b7e9d682a96cbe3ff54;hp=15a60d1e8722a617f28f78f35f69dcbea008a863;hpb=ac223c1e07cb56b69c8a11b94014a0ad3ccf393f;p=pulseview.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 15a60d1..9d2428a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ - +## ## This file is part of the PulseView project. ## ## Copyright (C) 2012 Joel Holdsworth @@ -24,7 +24,6 @@ include(FindPkgConfig) include(GNUInstallDirs) set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake") -include(cotire) project(pulseview) @@ -35,6 +34,7 @@ project(pulseview) option(DISABLE_WERROR "Build without -Werror" FALSE) option(ENABLE_SIGNALS "Build with UNIX signals" TRUE) option(ENABLE_DECODE "Build with libsigrokdecode" FALSE) +option(ENABLE_TESTS "Enable cotire" FALSE) option(ENABLE_TESTS "Enable unit tests" FALSE) option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE) @@ -47,7 +47,7 @@ if(WIN32) set(Boost_USE_STATIC_LIBS on) add_definitions(-DBOOST_THREAD_USE_LIB) - # Windsws does not support UNIX signals + # Windows does not support UNIX signals. set(ENABLE_SIGNALS FALSE) endif() @@ -55,9 +55,7 @@ endif() #= Dependencies #------------------------------------------------------------------------------- -list(APPEND PKGDEPS - libsigrok>=0.2.0 -) +list(APPEND PKGDEPS libsigrok>=0.2.0) if(ENABLE_DECODE) list(APPEND PKGDEPS libsigrokdecode>=0.2.0) @@ -149,7 +147,7 @@ set(pulseview_SOURCES pv/widgets/wellarray.cpp ) -# This list includes only QObject derrived class headers +# This list includes only QObject derived class headers. set(pulseview_HEADERS pv/mainwindow.h pv/sigsession.h @@ -281,13 +279,17 @@ add_executable(${PROJECT_NAME} ) target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS}) -cotire(${PROJECT_NAME}) if(WIN32) # Pass -mwindows so that no "DOS box" will open when PulseView is started. set_target_properties(${PROJECT_NAME} PROPERTIES LINK_FLAGS "-mwindows") endif() +if(ENABLE_COTIRE) + include(cotire) + cotire(${PROJECT_NAME}) +endif() + #=============================================================================== #= Installation #------------------------------------------------------------------------------- @@ -322,4 +324,4 @@ if(ENABLE_TESTS) add_subdirectory(test) enable_testing() add_test(test ${CMAKE_CURRENT_BINARY_DIR}/test/pulseview-test) -endif(ENABLE_TESTS) +endif()