CMakeList works on linux
merge branch
Merge branch 'master' of https://github.com/marcelfarres/geocomp-proj

Conflicts:
	CMakeCache.txt
	CMakeFiles/CMakeDirectoryInformation.cmake
	CMakeFiles/CMakeOutput.log
	CMakeFiles/Makefile.cmake
	CMakeFiles/Makefile2
	CMakeFiles/TargetDirectories.txt
	CMakeFiles/main.dir/CXX.includecache
	CMakeFiles/main.dir/DependInfo.cmake
	CMakeFiles/main.dir/build.make
	CMakeFiles/main.dir/depend.internal
	CMakeFiles/main.dir/depend.make
	CMakeFiles/main.dir/flags.make
	CMakeFiles/main.dir/link.txt
	CMakeFiles/main.dir/main.cpp.o
	CMakeFiles/progress.marks
	CMakeLists.txt
	Makefile
	main
	main.cpp
still merging...
still merging...