From ff8141fe9870135fe2c1dcc117dda7049fac6592 Mon Sep 17 00:00:00 2001 From: inv Date: Fri, 1 Nov 2013 17:12:49 +0000 Subject: [PATCH] Synchronize adm files --- adm_local_without_kernel/cmake_files/FindSphinx.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/adm_local_without_kernel/cmake_files/FindSphinx.cmake b/adm_local_without_kernel/cmake_files/FindSphinx.cmake index 472156bed..9871e4dd3 100644 --- a/adm_local_without_kernel/cmake_files/FindSphinx.cmake +++ b/adm_local_without_kernel/cmake_files/FindSphinx.cmake @@ -33,8 +33,11 @@ FIND_PROGRAM(SPHINX_EXECUTABLE sphinx-build PATH_SUFFIXES Scripts) # Get root dir locally, going up two levels from the exec: GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${SPHINX_EXECUTABLE}" PATH) GET_FILENAME_COMPONENT(_tmp_ROOT_DIR "${_tmp_ROOT_DIR}" PATH) -SET(SPHINX_PYTHONPATH "${_tmp_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages") - +IF(WIN32) + SET(SPHINX_PYTHONPATH "${_tmp_ROOT_DIR}/lib/site-packages") +ELSE() + SET(SPHINX_PYTHONPATH "${_tmp_ROOT_DIR}/lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages") +ENDIF() # Handle the standard arguments of the find_package() command: INCLUDE(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS(Sphinx REQUIRED_VARS SPHINX_EXECUTABLE) -- 2.39.2