Skip to content

Commit

Permalink
Merge branch 'trunk' into releases
Browse files Browse the repository at this point in the history
  • Loading branch information
da115115 committed Jan 17, 2019
2 parents acc0b8f + 5b1b0f9 commit b512f56
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions config/project_config_embeddable.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ macro (get_python)

# Set the Python installation directory
set (INSTALL_PY_LIB_DIR
${INSTALL_LIB_DIR}/python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}/site-packages/py${PROJECT_NAME}
${INSTALL_LIB_DIR}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/py${PROJECT_NAME}
CACHE PATH "Installation directory for Python libraries")

# Update the list of include directories for the project
Expand Down Expand Up @@ -1461,7 +1461,7 @@ macro (set_install_directories)
set (exec_prefix ${prefix})
set (bindir ${exec_prefix}/bin)
set (libdir ${exec_prefix}/${LIBDIR})
set (pylibdir ${libdir}/python${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR}/site-packages/py${PACKAGE})
set (pylibdir ${libdir}/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages/py${PACKAGE})
set (libexecdir ${exec_prefix}/libexec)
set (sbindir ${exec_prefix}/sbin)
set (sysconfdir ${prefix}/etc)
Expand Down

0 comments on commit b512f56

Please sign in to comment.