From dfc15a2f1705944a9aa693c8a019f58349dc3395 Mon Sep 17 00:00:00 2001
From: Ellon Mendes <ellon.mendes@laas.fr>
Date: Tue, 1 Dec 2015 14:11:39 +0100
Subject: [PATCH] Rename python module related cmake variables to improve
 readability

---
 python/CMakeLists.txt             | 18 +++++++++---------
 python/handwritten/CMakeLists.txt |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt
index 9c0ba1df8..98699cccc 100644
--- a/python/CMakeLists.txt
+++ b/python/CMakeLists.txt
@@ -21,13 +21,13 @@ endif()
 
 # Compose strings used to specify the boost python version. They will be empty if we want to use the defaut
 if(NOT GTSAM_PYTHON_VERSION STREQUAL "Default")
-	string(REPLACE "." "" BOOST_PYTHON_VERSION_STRING ${GTSAM_PYTHON_VERSION})       # Remove '.' from version
-	string(SUBSTRING ${BOOST_PYTHON_VERSION_STRING} 0 2 BOOST_PYTHON_VERSION_STRING) # Trim version number to 2 digits
-	set(BOOST_PYTHON_VERSION_STRING "-py${BOOST_PYTHON_VERSION_STRING}")             # Add '-py' prefix
-	string(TOUPPER ${BOOST_PYTHON_VERSION_STRING} UPPER_BOOST_PYTHON_VERSION_STRING) # Get uppercase string
+	string(REPLACE "." "" BOOST_PYTHON_VERSION_SUFFIX ${GTSAM_PYTHON_VERSION})           # Remove '.' from version
+	string(SUBSTRING ${BOOST_PYTHON_VERSION_SUFFIX} 0 2 BOOST_PYTHON_VERSION_SUFFIX)     # Trim version number to 2 digits
+	set(BOOST_PYTHON_VERSION_SUFFIX "-py${BOOST_PYTHON_VERSION_SUFFIX}")                 # Append '-py' prefix
+	string(TOUPPER ${BOOST_PYTHON_VERSION_SUFFIX} BOOST_PYTHON_VERSION_SUFFIX_UPPERCASE) # Get uppercase string
 else()
-	set(BOOST_PYTHON_VERSION_STRING "")
-	set(UPPER_BOOST_PYTHON_VERSION_STRING "")
+	set(BOOST_PYTHON_VERSION_SUFFIX "")
+	set(BOOST_PYTHON_VERSION_SUFFIX_UPPERCASE "")
 endif()
 
 # Find NumPy C-API
@@ -51,10 +51,10 @@ else()
 endif()
 
 # Find Boost Python
-find_package(Boost COMPONENTS python${BOOST_PYTHON_VERSION_STRING})
+find_package(Boost COMPONENTS python${BOOST_PYTHON_VERSION_SUFFIX})
 
 # Add handwritten directory if we found python and boost python
-if(Boost_PYTHON${UPPER_BOOST_PYTHON_VERSION_STRING}_FOUND AND PYTHONLIBS_FOUND)
+if(Boost_PYTHON${BOOST_PYTHON_VERSION_SUFFIX_UPPERCASE}_FOUND AND PYTHONLIBS_FOUND)
 	include_directories(${PYTHON_INCLUDE_DIRS})
 	include_directories(${Boost_INCLUDE_DIRS})
 	include_directories(${CMAKE_SOURCE_DIR}/gtsam/3rdparty/numpy_eigen/include/)
@@ -73,7 +73,7 @@ if(NOT PYTHONLIBS_FOUND)
 	endif()
 endif()
 
-if(NOT Boost_PYTHON${UPPER_BOOST_PYTHON_VERSION_STRING}_FOUND)
+if(NOT Boost_PYTHON${BOOST_PYTHON_VERSION_SUFFIX_UPPERCASE}_FOUND)
 	if(GTSAM_PYTHON_VERSION STREQUAL "Default")
 		message(WARNING "Default Boost python was not found -- Python module cannot be built. Option GTSAM_BUILD_PYTHON disabled.")
 	else()
diff --git a/python/handwritten/CMakeLists.txt b/python/handwritten/CMakeLists.txt
index ffd970217..50c316759 100644
--- a/python/handwritten/CMakeLists.txt
+++ b/python/handwritten/CMakeLists.txt
@@ -18,7 +18,7 @@ set_target_properties(${moduleName}_python PROPERTIES
     OUTPUT_NAME         ${moduleName}_python
     CLEAN_DIRECT_OUTPUT 1)
 
-target_link_libraries(${moduleName}_python ${Boost_PYTHON${UPPER_BOOST_PYTHON_VERSION_STRING}_LIBRARY} ${PYTHON_LIBRARY} ${gtsamLib}) #temp
+target_link_libraries(${moduleName}_python ${Boost_PYTHON${BOOST_PYTHON_VERSION_SUFFIX_UPPERCASE}_LIBRARY} ${PYTHON_LIBRARY} ${gtsamLib}) #temp
 
 # On OSX and Linux, the python library must end in the extension .so. Build this
 # filename here.