From: Alexandru Gagniuc <redacted>
Date: Fri, 12 Oct 2012 22:56:25 +0000 (+0100)
Subject: Unify the if(WIN32) defines
X-Git-Tag: pulseview-0.1.0~266
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=b04e278da5b0a9aa7d5e62bbb40f32f0e51f662d;p=pulseview.git

Unify the if(WIN32) defines

The if(WIN32)/else(WIN32)/endif(WIN32) is an archaic cmake syntax.
Remove all the if(WIN32) clauses, and use an option to specify whether
we want to link to the static versions of libsigrok*. That's basically
what the WIN32 clauses were doing anyway. This makes the "what is
going on" more readeable.

On WIN32, automatically set this option to link to the static libraries.
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 512ad187..60d7bfac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -28,6 +28,13 @@ project(pulseview)
 #-------------------------------------------------------------------------------
 
 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
@@ -114,39 +121,35 @@ add_definitions(-DAPP_VERSION="${VERSION}")
 #= Global Include Directories
 #-------------------------------------------------------------------------------
 
-# 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)
+include_directories(
+	${CMAKE_CURRENT_BINARY_DIR}
+	${Boost_INCLUDE_DIRS}
+)
+
+if(STATIC_PKGDEPS_LIBS)
+	include_directories(${PKGDEPS_STATIC_INCLUDE_DIRS})
+else()
+	include_directories(${PKGDEPS_INCLUDE_DIRS})
+endif()
 
 #===============================================================================
 #= Linker Configuration
 #-------------------------------------------------------------------------------
 
-# 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)
+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}
@@ -155,20 +158,7 @@ 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
@@ -188,20 +178,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)