make cuda compiler happy...

Source/Common/Include/Basics.h

@@ -669,6 +669,8 @@ static wstring TypeId()
 #error CNTK_COMPONENT_VERSION must be set
 #endif
 
+#define MY_CNTK_COMPONENT_VERSION(s) #s
+
 #ifdef _WIN32
 class Plugin
 {
@@ -683,7 +685,7 @@ public:
     FARPROC Load(const STRING& plugin, const std::string& proc)
     {
         m_dllName = msra::strfun::utf16(plugin);
-        m_dllName += L"-" + msra::strfun::utf16(CNTK_COMPONENT_VERSION);
+        m_dllName += L"-" + msra::strfun::utf16(std::string(MY_CNTK_COMPONENT_VERSION(CNTK_COMPONENT_VERSION)));
         m_dllName += L".dll";
         m_hModule = LoadLibrary(m_dllName.c_str());
         if (m_hModule == NULL)
@@ -715,7 +717,7 @@ public:
     void* Load(const STRING& plugin, const std::string& proc)
     {
         string soName = msra::strfun::utf8(plugin);
-        soName += std::string("-") + std::string(CNTK_COMPONENT_VERSION);
+        soName += std::string("-") + std::string(MY_CNTK_COMPONENT_VERSION(CNTK_COMPONENT_VERSION));
         soName = soName + ".so";
         void* handle = dlopen(soName.c_str(), RTLD_LAZY);
         if (handle == NULL)

Source/Math/MathCUDA.vcxproj

@@ -91,7 +91,7 @@
     <CudaCompile>
       <TargetMachinePlatform>64</TargetMachinePlatform>
       <GenerateLineInfo>true</GenerateLineInfo>
-      <AdditionalCompilerOptions>/WX</AdditionalCompilerOptions>
+      <AdditionalCompilerOptions>/DCNTK_COMPONENT_VERSION="$(CntkComponentVersion)" /WX</AdditionalCompilerOptions>
       <CodeGeneration>$(CudaCodeGen)</CodeGeneration>
       <FastMath>true</FastMath>
       <GPUDebugInfo>false</GPUDebugInfo>