Update CMakeLists.txt
Fix compilation on windows.
Merge pull request #454 from perroe/windows_compile_fix

Fix compilation on windows.
Merge remote-tracking branch 'upstream/master' into ERT-581

Conflicts:
	devel/python/test/CMakeLists.txt