projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ac223c1
)
Make cotire optional disabled by default
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Mon, 30 Dec 2013 13:34:54 +0000
(14:34 +0100)
committer
Joel Holdsworth
<joel@airwebreathe.org.uk>
Mon, 30 Dec 2013 13:40:26 +0000
(14:40 +0100)
CMakeLists.txt
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index 15a60d1e8722a617f28f78f35f69dcbea008a863..e542200fee57ad750bdaa41dd3dd902b746dcc66 100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-24,7
+24,6
@@
include(FindPkgConfig)
include(GNUInstallDirs)
set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
include(GNUInstallDirs)
set (CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMake")
-include(cotire)
project(pulseview)
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(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)
option(ENABLE_TESTS "Enable unit tests" FALSE)
option(STATIC_PKGDEPS_LIBS "Statically link to (pkgconfig) libraries" FALSE)
@@
-281,13
+281,17
@@
add_executable(${PROJECT_NAME}
)
target_link_libraries(${PROJECT_NAME} ${PULSEVIEW_LINK_LIBS})
)
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(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
#-------------------------------------------------------------------------------
#===============================================================================
#= Installation
#-------------------------------------------------------------------------------