nojhan/eodev
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of ssh://localhost:8479/gitroot/eodev/eodev

Browse source 
Conflicts:
	edo/src/edoSamplerNormalMulti.h
This commit is contained in:
nojhan 2011-12-23 16:06:52 +01:00
commit fdf3549b1c
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
eo/CMakeLists.txt
View file

@ -16,7 +16,7 @@ INCLUDE(eo-conf.cmake OPTIONAL)
PROJECT(EO)
# CMake > 2.8 is needed, because of the FindOpenMP feature
cmake_minimum_required(VERSION 2.8)
#cmake_minimum_required(VERSION 2.8)
#SET(PROJECT_VERSION_MAJOR 1)
#SET(PROJECT_VERSION_MINOR 1)