removed additional set cmake_minimum, each one resets any cmake polic…

…ies set.
vlachoudis · Feb 4, 2015 · 1188567 · 1188567
1 parent bdfb38f
commit 1188567
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,6 +5,8 @@
 #####################################################
 
 CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
+CMAKE_POLICY(SET CMP0004 OLD)
+CMAKE_POLICY(SET CMP0040 OLD)
 PROJECT ( DAGMC )
 SET ( DAGMC_VERSION_MAJOR 1 )
 SET ( DAGMC_VERSION_MINOR 0 )
@@ -26,6 +28,8 @@ INCLUDE_DIRECTORIES( ${MOAB_INCLUDE_DIRS} )
 SET ( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH})
 
 FIND_PACKAGE ( Pyne REQUIRED )
+
+#ADD_SUBDIRECTORY(pyne)
 LINK_DIRECTORIES(${PYNE_LIBS_DIR})
 INCLUDE_DIRECTORIES(${PYNE_INCLUDE_DIR})
 

diff --git a/fluka/CMakeLists.txt b/fluka/CMakeLists.txt
@@ -1,4 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 MESSAGE ( STATUS "Including FLUKA in dagmciface library.")
 
 SET ( CODE_SRCDIR "fluka" )

diff --git a/geant4/build/CMakeLists.txt b/geant4/build/CMakeLists.txt
@@ -2,7 +2,7 @@
 
 #----------------------------------------------------------------------------
 # Setup the project
-cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
+# cmake_minimum_required(VERSION 2.6 FATAL_ERROR)
 project(DagGeant4)
 
 #----------------------------------------------------------------------------

diff --git a/mcnp5/CMakeLists.txt b/mcnp5/CMakeLists.txt
@@ -1,4 +1,3 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 MESSAGE ( STATUS "Including MCNP5 in dagmciface library.")
 
 SET ( CODE_SRCDIR "mcnp5" )

diff --git a/mcnp5/build/CMakeLists.txt b/mcnp5/build/CMakeLists.txt
@@ -1,5 +1,4 @@
 # MCNP CMAKE FILE
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 enable_language(Fortran)
 PROJECT(MCNP5)
 

diff --git a/tally/CMakeLists.txt b/tally/CMakeLists.txt
@@ -1,5 +1,7 @@
 # CMAKE build script for DAGMC Tally
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+# CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+# CMAKE_POLICY(SET CMP0004 OLD)
+# CMAKE_POLICY(SET CMP0040 OLD)
 ENABLE_LANGUAGE(Fortran)
 MESSAGE(STATUS "Creating DAGTally Library WITH " ${DAGMC_LIBRARIES})
 SET ( DAG_TALLY_SRC_FILES

diff --git a/tally/tests/CMakeLists.txt b/tally/tests/CMakeLists.txt
@@ -1,6 +1,6 @@
 # CMAKE build script for DAGMC Tally unit testing
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+# CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 # Where to look for includes
 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/tally )

diff --git a/uwuw/CMakeLists.txt b/uwuw/CMakeLists.txt
@@ -1,4 +1,4 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+#CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 MESSAGE ( STATUS "Including UWUW in dagmciface library.")
 
 SET ( CODE_SRCDIR "uwuw" )