Commit 9540fe02 authored by Salko Jr, Robert's avatar Salko Jr, Robert
Browse files

Eliminate miniconda install 

The miniconda is not working correctly currently and has been causing a lot of problems and slow installs.  I am going to test out relying on the installed python insted.
parent b0771c53

CMakeLists.txt

+0 −58
Original line number Diff line number Diff line
@@ -25,65 +25,7 @@ find_program(PYTHON "python") 
SET(PYTHON_EXE

    ${PYTHON}

)

# Find if a Python module is installed

# Found at http://www.cmake.org/pipermail/cmake/2011-January/041666.html

# To use do: find_python_module(PyQt4 REQUIRED)

function(find_python_module module)

	string(TOUPPER ${module} module_upper)

	if(NOT PY_${module_upper})

		if(ARGC GREATER 1 AND ARGV1 STREQUAL "REQUIRED")

			set(${module}_FIND_REQUIRED TRUE)

		endif()

		# A module's location is usually a directory, but for binary modules

		# it's a .so file.

		execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c"

			"import re, ${module}; print(re.compile('/__init__.py.*').sub('',${module}.__file__))"

			RESULT_VARIABLE _${module}_status

			OUTPUT_VARIABLE _${module}_location

			ERROR_QUIET

			OUTPUT_STRIP_TRAILING_WHITESPACE)

		if(NOT _${module}_status)

			set(PY_${module_upper} ${_${module}_location} CACHE STRING

				"Location of Python module ${module}")

		endif(NOT _${module}_status)

	endif(NOT PY_${module_upper})

	find_package_handle_standard_args(PY_${module} DEFAULT_MSG PY_${module_upper})

endfunction(find_python_module)





if(NOT "find_python_module(PyQt4)")

  SET(MAKE_INSTALL_DIR_COMMAND

  "mkdir -p ${CMAKE_CURRENT_BINARY_DIR}"

  )

  if(UNIX AND NOT APPLE)

     SET(PYTHON_CONFIGURE_COMMAND

     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/bundle/linux/Miniconda2-latest-Linux-x86_64.sh -b -u -p ${CMAKE_CURRENT_BINARY_DIR}/conda"

     )

     SET(PYTHON_UPDATE_COMMAND

     "${CMAKE_CURRENT_BINARY_DIR}/conda/bin/pip install -r ${CMAKE_CURRENT_SOURCE_DIR}/cmake/bundle/linux/requirements.txt --no-index --find-links file://${CMAKE_CURRENT_SOURCE_DIR}/cmake/bundle/linux"

     )

     MESSAGE("Building Python via Miniconda")

  else()

     SET(PYTHON_CONFIGURE_COMMAND

     "${CMAKE_CURRENT_SOURCE_DIR}/cmake/bundle/macos/Miniconda2-latest-MacOSX-x86_64.sh -b -u -p ${CMAKE_CURRENT_BINARY_DIR}/conda"

     )

     SET(PYTHON_UPDATE_COMMAND

     "${CMAKE_CURRENT_BINARY_DIR}/conda/bin/pip install -r ${CMAKE_CURRENT_BINARY_DIR}/cmake/bundle/macos/requirements.txt --no-index --find-links file://${CMAKE_CURRENT_BINARY_DIR}/cmake/bundle/macos"

     )

     MESSAGE("bash  -c ${PYTHON_CONFIGURE_COMMAND}")

  endif()

  execute_process(

      COMMAND mkdir -p ${CMAKE_INSTALL_PREFIX}/conda

      COMMAND bash -c ${PYTHON_CONFIGURE_COMMAND}

      OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/miniconda.log

  )

  execute_process(

       COMMAND bash -c ${PYTHON_UPDATE_COMMAND}

       OUTPUT_FILE${CMAKE_CURRENT_BINARY_DIR}/update_miniconda.log

  )

endif()



INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/conda DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS )

INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/SubKit DESTINATION ${CMAKE_INSTALL_PREFIX} USE_SOURCE_PERMISSIONS )

INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/wasp   DESTINATION ${CMAKE_INSTALL_PREFIX}/SubKit USE_SOURCE_PERMISSIONS )

INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/MANIFEST.in ${CMAKE_CURRENT_BINARY_DIR}/setup.py DESTINATION  ${CMAKE_INSTALL_PREFIX} PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ WORLD_WRITE)