X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=60d7bfacfb37000059e9e2602611c449b5275fbe;hb=b04e278da5b0a9aa7d5e62bbb40f32f0e51f662d;hp=41e623186e42e1f085f019a34c05a4be16ecc611;hpb=bc1c1462b366a327e2abfc3c0169ab2f657533a5;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 41e6231..60d7bfa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,6 +2,7 @@
 ## This file is part of the PulseView project.
 ##
 ## Copyright (C) 2012 Joel Holdsworth <joel@airwebreathe.org.uk>
+## Copyright (C) 2012 Alexandru Gagniuc <mr.nuke.me@gmail.com>
 ##
 ## This program is free software: you can redistribute it and/or modify
 ## it under the terms of the GNU General Public License as published by
@@ -22,6 +23,23 @@ include(FindPkgConfig)
 
 project(pulseview)
 
+#===============================================================================
+#= User Options
+#-------------------------------------------------------------------------------
+
+option(ENABLE_TESTS "Enable unit tests" FALSE)
+option(STATIC_PKGDEPS_LIBS "Statically link to sigrok libraries" FALSE)
+
+if(WIN32)
+	# On Windows/MinGW we need to statically link to libraries
+	# This option is user configurable, but enable it by default on win32
+	set(STATIC_PKGDEPS_LIBS TRUE)
+endif()
+
+#===============================================================================
+#= Dependencies
+#-------------------------------------------------------------------------------
+
 find_package(PkgConfig)
 pkg_check_modules(PKGDEPS REQUIRED
 	libsigrokdecode>=0.1.0
@@ -30,7 +48,7 @@ pkg_check_modules(PKGDEPS REQUIRED
 
 # On Windows/MinGW we explicitly point cmake to the Boost directory.
 if(WIN32)
-set(BOOST_ROOT /usr/local)
+	set(BOOST_ROOT /usr/local)
 endif(WIN32)
 
 find_package(Qt4 REQUIRED)
@@ -38,6 +56,10 @@ find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
 
 set(VERSION 0.1.0)
 
+#===============================================================================
+#= Sources
+#-------------------------------------------------------------------------------
+
 set(pulseview_SOURCES
 	main.cpp
 	pv/about.cpp
@@ -88,38 +110,46 @@ qt4_add_resources(pulseview_RESOURCES_RCC ${pulseview_RESOURCES})
 
 include(${QT_USE_FILE})
 
+#===============================================================================
+#= Global Definitions
+#-------------------------------------------------------------------------------
+
 add_definitions(${QT_DEFINITIONS})
 add_definitions(-DAPP_VERSION="${VERSION}")
 
-# On Windows/MinGW we need PKGDEPS_STATIC_INCLUDE_DIRS.
-if(WIN32)
-include_directories(
-	${include_directories}
-	${CMAKE_CURRENT_BINARY_DIR}
-	${Boost_INCLUDE_DIRS}
-	${PKGDEPS_STATIC_INCLUDE_DIRS}
-)
-else(WIN32)
+#===============================================================================
+#= Global Include Directories
+#-------------------------------------------------------------------------------
+
 include_directories(
-	${include_directories}
 	${CMAKE_CURRENT_BINARY_DIR}
 	${Boost_INCLUDE_DIRS}
-	${PKGDEPS_INCLUDE_DIRS}
 )
-endif(WIN32)
 
-# On Windows/MinGW we need PKGDEPS_STATIC_LIBRARY_DIRS.
-if(WIN32)
-link_directories(
-	${Boost_LIBRARY_DIRS}
-	${PKGDEPS_STATIC_LIBRARY_DIRS}
-)
-else(WIN32)
-link_directories(
-	${Boost_LIBRARY_DIRS}
-	${PKGDEPS_LIBRARY_DIRS}
+if(STATIC_PKGDEPS_LIBS)
+	include_directories(${PKGDEPS_STATIC_INCLUDE_DIRS})
+else()
+	include_directories(${PKGDEPS_INCLUDE_DIRS})
+endif()
+
+#===============================================================================
+#= Linker Configuration
+#-------------------------------------------------------------------------------
+
+link_directories(${Boost_LIBRARY_DIRS})
+
+set(PULSEVIEW_LINK_LIBS
+	${Boost_LIBRARIES}
+	${QT_LIBRARIES}
 )
-endif(WIN32)
+
+if(STATIC_PKGDEPS_LIBS)
+	link_directories(${PKGDEPS_STATIC_LIBRARY_DIRS})
+	list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_STATIC_LIBRARIES})
+else()
+	link_directories(${PKGDEPS_LIBRARY_DIRS})
+	list(APPEND PULSEVIEW_LINK_LIBS ${PKGDEPS_LIBRARIES})
+endif()
 
 add_executable(pulseview
 	${pulseview_SOURCES}
@@ -128,47 +158,29 @@ add_executable(pulseview
 	${pulseview_RESOURCES_RCC}
 )
 
-# On Windows/MinGW we need PKGDEPS_STATIC_LIBRARIES.
-if(WIN32)
-target_link_libraries(pulseview
-	${Boost_LIBRARIES}
-	${PKGDEPS_STATIC_LIBRARIES}
-	${QT_LIBRARIES}
-)
-else(WIN32)
-target_link_libraries(pulseview
-	${Boost_LIBRARIES}
-	${PKGDEPS_LIBRARIES}
-	${QT_LIBRARIES}
-)
-endif(WIN32)
+target_link_libraries(pulseview ${PULSEVIEW_LINK_LIBS})
+
+#===============================================================================
+#= Installation
+#-------------------------------------------------------------------------------
 
 install(PROGRAMS pulseview DESTINATION bin/)
 
+#===============================================================================
+#= Tests
+#-------------------------------------------------------------------------------
+
 if(ENABLE_TESTS)
 
-add_definitions(-DBOOST_TEST_DYN_LINK)
+	add_definitions(-DBOOST_TEST_DYN_LINK)
 
-add_executable(pulseview-test
-	${pulseview_TEST_SOURCES}
-)
+	add_executable(pulseview-test
+		${pulseview_TEST_SOURCES}
+	)
 
-# On Windows/MinGW we need PKGDEPS_STATIC_LIBRARIES.
-if(WIN32)
-target_link_libraries(pulseview-test
-	${Boost_LIBRARIES}
-	${PKGDEPS_STATIC_LIBRARIES}
-	${QT_LIBRARIES}
-)
-else(WIN32)
-target_link_libraries(pulseview-test
-	${Boost_LIBRARIES}
-	${PKGDEPS_LIBRARIES}
-	${QT_LIBRARIES}
-)
-endif(WIN32)
+	target_link_libraries(pulseview-test ${PULSEVIEW_LINK_LIBS})
 
-enable_testing()
-add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test)
+	enable_testing()
+	add_test(test ${CMAKE_CURRENT_BINARY_DIR}/pulseview-test)
 
 endif(ENABLE_TESTS)