Merge branch 'master' into boost_filesystem

Conflicts:
	boost.pri
	tests/CMakeLists.txt

1 files changed, 20 insertions, 10 deletions

diff --git a/flex.pri b/flex.pri
index 2042952..2e1559e 100644
--- a/flex.pri
+++ b/flex.pri
@@ -1,10 +1,20 @@
-#setup flex for qmake

-

-flex.name = Flex ${QMAKE_FILE_IN}

-flex.input = FLEXSOURCES

-flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp

-flex.commands = flex -P ${QMAKE_FILE_BASE} -o${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN}

-flex.CONFIG += target_predeps

-flex.variable_out = GENERATED_SOURCES

-silent:flex.commands = @echo Lex ${QMAKE_FILE_IN} && $$flex.commands

-QMAKE_EXTRA_COMPILERS += flex

+win32 {
+  flex.name = Flex ${QMAKE_FILE_IN}
+  flex.input = FLEXSOURCES
+  flex.output = ${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp
+  flex.commands = flex -P ${QMAKE_FILE_BASE} -o${QMAKE_FILE_PATH}/${QMAKE_FILE_BASE}.lexer.cpp ${QMAKE_FILE_IN}
+  flex.CONFIG += target_predeps
+  flex.variable_out = GENERATED_SOURCES
+  silent:flex.commands = @echo Lex ${QMAKE_FILE_IN} && $$flex.commands
+  QMAKE_EXTRA_COMPILERS += flex
+}
+
+unix:freebsd-g++ {
+  QMAKE_LEX = /usr/local/bin/flex
+}
+
+unix:linux* {
+  exists(/usr/bin/flex) {
+    QMAKE_LEX = /usr/bin/flex
+  }
+}