Merge branch 'release/v0.5.3' of https://github.com/mikrosimage/avTranscoder into develop

Clement Champetier · Clement Champetier · commit 2b4dc0ae7106 · 2015-03-13T17:13:00.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -31,7 +31,7 @@ endif()
 
 add_subdirectory(src)
 
-if(DISABLE_APPS)
+if(AVTRANSCODER_DISABLE_APPS)
 	message("Apps disabled, will not build applications.")
 else()
 	add_subdirectory(app)
diff --git a/INSTALL.md b/INSTALL.md
@@ -17,18 +17,18 @@ cmake .. -DFFMPEG_INCLUDE_DIR=/path/to/include/ -DFFMPEG_LIBRARY_DIR=/path/to/li
 
 #### To not build apps
 ```
-cmake .. -DDISABLE_APPS=True
+cmake .. -DAVTRANSCODER_DISABLE_APPS=True
 ```
 
 #### To not build bindings
 ```
-cmake .. -DDISABLE_BINDINGS=True
+cmake .. -DAVTRANSCODER_DISABLE_BINDINGS=True
 ```
 ```
-cmake .. -DDISABLE_PYTHON_BINDING=True
+cmake .. -DAVTRANSCODER_DISABLE_PYTHON_BINDING=True
 ```
 ```
-cmake .. -DDISABLE_JAVA_BINDING=True
+cmake .. -DAVTRANSCODER_DISABLE_JAVA_BINDING=True
 ```
 
 #### Other useful flags
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -62,7 +62,7 @@ install(
 )
 
 ### Bindings with SWIG
-if(DISABLE_BINDINGS)
+if(AVTRANSCODER_DISABLE_BINDINGS)
 	message("Bindings disabled, will not build bindings.")
 	return()
 endif()
@@ -78,7 +78,7 @@ if(SWIG_FOUND)
 	set_source_files_properties(${AVTRANSCODER_BINDING_FILE} PROPERTIES CPLUSPLUS ON)
 
 	### PYTHON BINDING
-	if(DISABLE_PYTHON_BINDING)
+	if(AVTRANSCODER_DISABLE_PYTHON_BINDING)
 		message("PYTHON binding disabled, will not build python binding.")
 	else()
 		find_package(PythonLibs)
@@ -113,7 +113,7 @@ if(SWIG_FOUND)
         endif()
 
 	### JAVA BINDING
-        if(DISABLE_JAVA_BINDING)
+        if(AVTRANSCODER_DISABLE_JAVA_BINDING)
 		message("JAVA binding disabled, will not build java binding.")
         else()
 		find_package(Java)
