yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3648
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Mon 2015-05-04 18:59:30 +0200
message:
  Replace INSTALL_PREFIX by CMAKE_INSTALL_PREFIX
  
  It is better to use standard CMAKE-variable for that.
  Please update the variable in your build-palce.
  INSTALL_PREFIX will be removed soon.
modified:
  CMakeLists.txt
  doc/sphinx/installation.rst


--
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	2015-04-30 17:41:40 +0000
+++ CMakeLists.txt	2015-05-04 16:59:30 +0000
@@ -1,5 +1,5 @@
 # The YADE has the following parameters to configure:
-#  INSTALL_PREFIX: path, where Yade will be installed (/usr/local by default)
+#  CMAKE_INSTALL_PREFIX: path, where Yade will be installed (/usr/local by default)
 #  LIBRARY_OUTPUT_PATH: path to install libraries (lib by default)
 #  DEBUG: compile in debug-mode (OFF by default)
 #  CMAKE_VERBOSE_MAKEFILE: output additional information during compiling (OFF by default)
@@ -15,12 +15,12 @@
 #  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_SPH: enable SPH-option, Smoothed Particle Hydrodynamics (OFF by default)
 #  ENABLE_LIQMIGRATION: enable LIQMIGRATION-option, see [Mani2013] for details (OFF by default)
 #  ENABLE_MASK_ARBITRARY: enable MASK_ARBITRARY option (OFF by default)
 #  ENABLE_PROFILING: enable profiling, e.g. shows some more metrics, which can define bottlenecks of the code (OFF by default)
 #  runtimePREFIX: used for packaging, when install directory is not the same is runtime directory (/usr/local by default)
-#  CHUNKSIZE: set >1, if you want several sources to be compiled at once. Increases compilation speed and RAM-consumption during it (1 by default).
+#  CHUNKSIZE: set >1, if you want several sources to be compiled at once. Increases compilation speed and RAM-consumption during it (1 by default)
 #  VECTORIZE: enables vectorization and alignment in Eigen3 library, experimental (OFF by default)
 
 project(Yade C CXX)
@@ -379,13 +379,16 @@
 
 #===========================================================
 
-IF (NOT INSTALL_PREFIX)
- SET(CMAKE_INSTALL_PREFIX "/usr/local")
- MESSAGE("Yade will be installed to default path ${CMAKE_INSTALL_PREFIX}, if you want to override it use -DINSTALL_PREFIX option.")
-ELSE (NOT INSTALL_PREFIX)
-	GET_FILENAME_COMPONENT(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX} ABSOLUTE)
-	MESSAGE("Yade will be installed to ${CMAKE_INSTALL_PREFIX}")
-ENDIF (NOT INSTALL_PREFIX)
+IF (INSTALL_PREFIX)
+  SET(CMAKE_INSTALL_PREFIX ${INSTALL_PREFIX})
+  MESSAGE(WARNING "Use CMAKE_INSTALL_PREFIX option instead of INSTALL_PREFIX! It will be removed soon.")
+ENDIF (INSTALL_PREFIX)
+
+IF (CMAKE_INSTALL_PREFIX)
+  MESSAGE("Yade will be installed to ${CMAKE_INSTALL_PREFIX}")
+ELSE (CMAKE_INSTALL_PREFIX)
+  MESSAGE("Yade will be installed to default path ${CMAKE_INSTALL_PREFIX}, if you want to override it use -DCMAKE_INSTALL_PREFIX option.")
+ENDIF (CMAKE_INSTALL_PREFIX)
 
 IF (NOT SUFFIX)
   SET (SUFFIX "-${YADE_VERSION}")

=== modified file 'doc/sphinx/installation.rst'
--- doc/sphinx/installation.rst	2015-04-24 15:54:07 +0000
+++ doc/sphinx/installation.rst	2015-05-04 16:59:30 +0000
@@ -188,11 +188,11 @@
 
 Then inside this build-directory you should start cmake to configure the compilation process::
 
-	cmake -DINSTALL_PREFIX=/path/to/installfolder /path/to/sources
+	cmake -DCMAKE_INSTALL_PREFIX=/path/to/installfolder /path/to/sources
 
 For the folder structure given above call the following command in folder "build":
 
-	cmake -DINSTALL_PREFIX=../install ../trunk
+	cmake -DCMAKE_INSTALL_PREFIX=../install ../trunk
 
 Additional options can be configured in the same line with the following 
 syntax::
@@ -201,7 +201,7 @@
 	
 The following options are available:
 	
-	* INSTALL_PREFIX: path where Yade should be installed (/usr/local by default)
+	* CMAKE_INSTALL_PREFIX: path where Yade should be installed (/usr/local by default)
 	* LIBRARY_OUTPUT_PATH: path to install libraries (lib by default)
 	* DEBUG: compile in debug-mode (OFF by default)
 	* CMAKE_VERBOSE_MAKEFILE: output additional information during compiling (OFF by default)
@@ -216,8 +216,14 @@
 	* 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)
+	* ENABLE_LIQMIGRATION: enable LIQMIGRATION-option, see [Mani2013] for details (OFF by default)
+	* ENABLE_MASK_ARBITRARY: enable MASK_ARBITRARY option (OFF by default)
+	* ENABLE_PROFILING: enable profiling, e.g. shows some more metrics, which can define bottlenecks of the code (OFF by default)
 	* runtimePREFIX: used for packaging, when install directory is not the same is runtime directory (/usr/local by default)
-	* CHUNKSIZE: used, if you want several sources to be compiled at once. Increases compilation speed and RAM-consumption during it (1 by default).
+	* CHUNKSIZE: used, if you want several sources to be compiled at once. Increases compilation speed and RAM-consumption during it (1 by default)
+	* VECTORIZE: enables vectorization and alignment in Eigen3 library, experimental (OFF by default)
 
 For using an extended parameters of cmake, please, follow the corresponding
 documentation on cmake-webpage.