X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=CMakeLists.txt;h=c6459353b62a63f19e757e10e93075961217cd6a;hb=cef18fc6160f8f5055f2617fbe06eb082c2a7bd5;hp=07c2d4b98531299433ac1b9497c082b7b91e5b8b;hpb=951c583c1928fb0aeaea4b980114bcf74c362c42;p=pulseview.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 07c2d4b..c645935 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
@@ -36,7 +54,25 @@ endif(WIN32)
 find_package(Qt4 REQUIRED)
 find_package(Boost 1.46 COMPONENTS unit_test_framework REQUIRED)
 
-set(VERSION 0.1.0)
+#===============================================================================
+#= Config Header
+#-------------------------------------------------------------------------------
+
+set(PV_VERSION_MAJOR 0)
+set(PV_VERSION_MINOR 1)
+set(PV_VERSION_MICRO 0)
+set(PV_VERSION_STRING
+	${PV_VERSION_MAJOR}.${PV_VERSION_MINOR}.${PV_VERSION_MICRO}
+)
+
+configure_file (
+	${PROJECT_SOURCE_DIR}/config.h.in
+	${PROJECT_BINARY_DIR}/config.h
+)
+
+#===============================================================================
+#= Sources
+#-------------------------------------------------------------------------------
 
 set(pulseview_SOURCES
 	main.cpp
@@ -88,38 +124,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)
-	include_directories(
-		${include_directories}
-		${CMAKE_CURRENT_BINARY_DIR}
-		${Boost_INCLUDE_DIRS}
-		${PKGDEPS_INCLUDE_DIRS}
-	)
-endif(WIN32)
+#===============================================================================
+#= Global Include Directories
+#-------------------------------------------------------------------------------
 
-# 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}
-	)
-endif(WIN32)
+include_directories(
+	${CMAKE_CURRENT_BINARY_DIR}
+	${CMAKE_CURRENT_SOURCE_DIR}
+	${Boost_INCLUDE_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}
+)
+
+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,23 +172,18 @@ 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)
@@ -153,20 +192,7 @@ if(ENABLE_TESTS)
 		${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)