yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4068
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Thu 2014-07-10 23:33:55 +0200
message:
  Capitalize feature list.
  
  It should make feature enabling more intuitive,
  adding to a desired feature ENABLE_ prefix to
  enable it instead of looking into the code.
  
  Discussed with Klaus in the tram.
modified:
  CMakeLists.txt


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-10 21:27:29 +0000
+++ CMakeLists.txt	2014-07-10 21:33:55 +0000
@@ -14,8 +14,8 @@
 #  ENABLE_GL2PS: enable GL2PS-option (ON by default)
 #  ENABLE_LINSOLV: enable LINSOLV-option (ON by default)
 #  ENABLE_PFVFLOW: enable PFVFLOW-option, FlowEngine (ON by default)
+#  ENABLE_LBMFLOW: enable LBMFLOW-option, LBM_ENGINE (ON by default)
 #  ENABLE_SPH: enable SPH-option, Smoothed Particle Hydrodynamics (OFF by default, experimental)
-#  ENABLE_LBMFLOW: enable LBMFLOW-option, LBM_ENGINE (ON by default)
 #  ENABLE_LIQMIGRATION: enable LIQMIGRATION-option, see [Mani2013] for details (OFF by default)
 #  ENABLE_MASK_ARBITRARY: enable MASK_ARBITRARY option (OFF by default)
 #  runtimePREFIX: used for packaging, when install directory is not the same is runtime directory (/usr/local by default)
@@ -267,9 +267,9 @@
 
     IF(ENABLE_PFVFLOW)
       SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DFLOW_ENGINE")
-      SET(CONFIGURED_FEATS "${CONFIGURED_FEATS} PFVflow") 
+      SET(CONFIGURED_FEATS "${CONFIGURED_FEATS} PFVFLOW")
     ELSE(ENABLE_PFVFLOW)
-      SET(DISABLED_FEATS "${DISABLED_FEATS} PFVflow")
+      SET(DISABLED_FEATS "${DISABLED_FEATS} PFVFLOW")
     ENDIF(ENABLE_PFVFLOW)
 
   ELSE(CGAL_FOUND AND GMP_FOUND AND (NOT("${CMAKE_CXX_COMPILER} ${CMAKE_CXX_COMPILER_ARG1}" MATCHES ".*clang")))
@@ -277,7 +277,7 @@
     SET(DISABLED_FEATS "${DISABLED_FEATS} CGAL")
     SET(ENABLE_CGAL OFF)
     IF(ENABLE_PFVFLOW)
-      SET(DISABLED_FEATS "${DISABLED_FEATS} PFVflow")
+      SET(DISABLED_FEATS "${DISABLED_FEATS} PFVFLOW")
       MESSAGE(STATUS "CGAL NOT found: PFVFLOW disabled")
     ENDIF(ENABLE_PFVFLOW)
 
@@ -297,14 +297,14 @@
     MESSAGE(STATUS "Found Cholmod")
     MESSAGE(STATUS "Found OpenBlas")
     MESSAGE(STATUS "Found Metis")
-    SET(CONFIGURED_FEATS "${CONFIGURED_FEATS} LinSolv")
+    SET(CONFIGURED_FEATS "${CONFIGURED_FEATS} LINSOLV")
   ELSE(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND)
     MESSAGE(STATUS "Missing dependency for LINSOLV, disabled")
-    SET(DISABLED_FEATS "${DISABLED_FEATS} LinSolv")
+    SET(DISABLED_FEATS "${DISABLED_FEATS} LINSOLV")
     SET(ENABLE_LINSOLV OFF)
   ENDIF(CHOLMOD_FOUND AND OPENBLAS_FOUND AND METIS_FOUND)
 ELSE(ENABLE_LINSOLV)
-  SET(DISABLED_FEATS "${DISABLED_FEATS} LinSolv")
+  SET(DISABLED_FEATS "${DISABLED_FEATS} LINSOLV")
 ENDIF(ENABLE_LINSOLV)
 #===============================================
 IF(ENABLE_SPH)