some minor changes in cmake configuration

12 jobs for master in 77 minutes and 44 seconds (queued for 1 second)
Status Name Job ID Coverage
  Build
passed build:9-debug-gcc #1100

00:39:24

passed build:9-parallel-debug-gcc #1102

00:50:37

passed build:9-parallel-release-gcc #1103

00:52:27

passed build:9-release-gcc #1101

00:42:59

 
  Demo
passed demo:9-debug-gcc #1104

00:03:57

passed demo:9-parallel-debug-gcc #1106

00:06:11

passed demo:9-parallel-release-gcc #1107

00:05:30

passed demo:9-release-gcc #1105

00:03:56

 
  Test
passed test:9-debug-gcc #1108

00:06:12

passed test:9-parallel-debug-gcc #1110

00:05:49

passed test:9-parallel-release-gcc #1111

00:07:37

passed test:9-release-gcc #1109

00:08:25