griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

CMake: fix windows build and warning

Browse Source 
Missing underscore in platform/platform_win32.cmake
and a quote too many in macros.cmake
This commit is contained in:
Ray Molenkamp
2023-08-09 21:47:19 -06:00
parent dfc7edfe72
commit 4ad63687cb
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/cmake/macros.cmake
View File

@@ -1319,7 +1319,7 @@ function(find_python_package
"'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/vendor-packages/${package}', "
"'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/vendor-packages/${package}', "
"\n"
"The 'WITH_PYTHON_INSTALL_${_upper_package}' ""option will be ignored "
"The 'WITH_PYTHON_INSTALL_${_upper_package}' option will be ignored "
"when installing Python.\n"
"The build will be usable, only add-ons that depend on this package won't be functional."
)

2
build_files/cmake/platform/platform_win32.cmake
View File

@@ -518,7 +518,7 @@ if(WITH_JACK)
endif()
set(_PYTHON_VERSION "3.10")
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${PYTHON_VERSION})
string(REPLACE "." "" _PYTHON_VERSION_NO_DOTS ${_PYTHON_VERSION})
# Python executable is needed as part of the build-process,
# note that building without Python is quite unusual.
set(PYTHON_EXECUTABLE ${LIBDIR}/python/${_PYTHON_VERSION_NO_DOTS}/bin/python$<$<CONFIG:Debug>:_d>.exe)