-
-
Notifications
You must be signed in to change notification settings - Fork 6.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[cmake/win32] fixes for building with abnormal configuration #10946
Conversation
Thanks for looking into this. CMake changes look sane. As for the rest, we need an win dev. ping @Paxxi |
jenkins build failed last time with this PR. |
If it helps any review of this PR: |
Anyone has a reason not to merge this? If so, speak in the next 24h or I'll push it in. |
what should I take a look on? I know nothing about cmake. |
The ifdeferry? It's not a CMake invention... ;) |
@@ -96,6 +98,7 @@ CDetectDisc::CDetectDisc(const std::string &strPath, const bool bautorun) | |||
bool CDetectDisc::DoWork() | |||
{ | |||
CLog::Log(LOGDEBUG, "%s: Optical media found in drive %s", __FUNCTION__, m_strPath.c_str()); | |||
#ifdef HAS_DVD_DRIVE |
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
This comment was marked as spam.
This comment was marked as spam.
Sorry, something went wrong.
Rebased and a moved Completely removing |
jenkins build this please |
Looks good to me |
jenkins build and merge |
Description
Building fails (on windows) when version tag is empty, app name is changed or when optical/upnp/airtunes is disabled
Motivation and Context
Fixes building of abnormal configuration on windows
How Has This Been Tested?
Compile tested with cmake 3.6.3 and visual studio 2015 on windows 10
Screenshots (if appropriate):
Types of change
Checklist: