Simplify Python cmake code

Author: FilipeMaia

CMakeLists.txt

@@ -58,16 +58,16 @@ if(PYTHON_WRAPPERS)
   find_package (Python3 COMPONENTS Interpreter Development NumPy)
   if(Python3_Interpreter_FOUND)
     set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE} CACHE PATH "Python interpreter executable")
-    set(PYTHON_INCLUDE_PATH ${Python3_INCLUDE_DIRS})
-    set(PYTHON_LIBRARIES ${Python3_LIBRARIES})
-    set(PYTHON_NUMPY_INCLUDE_DIR ${Python3_NumPy_INCLUDE_DIRS})
+    set(PYTHON_INCLUDE_PATH ${Python3_INCLUDE_DIRS} CACHE PATH "Python include dirs" ADVANCED)
+    set(PYTHON_LIBRARIES ${Python3_LIBRARIES} CACHE PATH "Python libraries" ADVANCED)
+    set(PYTHON_NUMPY_INCLUDE_DIR ${Python3_NumPy_INCLUDE_DIRS} CACHE PATH "Python NumPy include dirs" ADVANCED)
     set(PYTHON_NUMPY_FOUND ${Python3_NumPy_FOUND})
   else()
     message(FATAL_ERROR "Python interpreter not found")
   endif()
   find_package(SWIG)
   if(PYTHON_LIBRARIES AND SWIG_FOUND AND PYTHON_EXECUTABLE AND PYTHON_NUMPY_FOUND)
-    SET(PYTHON_INSTDIR ${Python3_SITELIB} CACHE PATH "Installation directory for python module.")
+    SET(PYTHON_INSTDIR ${Python3_SITELIB} CACHE PATH "Installation directory for python module." ADVANCED)
   endif()
 endif(PYTHON_WRAPPERS)
 IF(USE_CUDA)

src/CMakeLists.txt

@@ -40,28 +40,6 @@ INSTALL(TARGETS spimage
   LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
   ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR})
 
-
-# Find the python interpreter without calling the findpackage 
-# FIND_PROGRAM(PYTHON_EXECUTABLE
-#   NAMES python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
-#   PATHS
-#   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath]
-#   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath]
-#   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath]
-#   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.3\\InstallPath]
-#   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.2\\InstallPath]
-#   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.1\\InstallPath]
-#   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.0\\InstallPath]
-#   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.6\\InstallPath]
-#   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\1.5\\InstallPath]
-#   )
-
-# handle the QUIETLY and REQUIRED arguments and set PYTHONINTERP_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-
-
-MARK_AS_ADVANCED(PYTHON_EXECUTABLE)
 if(SWIG_FOUND AND Python3_Interpreter_FOUND AND PYTHON_NUMPY_FOUND)
   FILE(GLOB spimage_headers "${CMAKE_CURRENT_SOURCE_DIR}/../include/spimage/*.h")