You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by ma...@apache.org on 2015/07/16 12:09:29 UTC
incubator-kylin git commit: ODBC: change dependency folder
Repository: incubator-kylin
Updated Branches:
refs/heads/0.8 fff9b188f -> 47746435a
ODBC: change dependency folder
Project: http://git-wip-us.apache.org/repos/asf/incubator-kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-kylin/commit/47746435
Tree: http://git-wip-us.apache.org/repos/asf/incubator-kylin/tree/47746435
Diff: http://git-wip-us.apache.org/repos/asf/incubator-kylin/diff/47746435
Branch: refs/heads/0.8
Commit: 47746435a3d0917526e1ccb489a15ce259f1f14e
Parents: fff9b18
Author: honma <ho...@ebay.com>
Authored: Thu Jul 16 18:03:03 2015 +0800
Committer: honma <ho...@ebay.com>
Committed: Thu Jul 16 18:08:29 2015 +0800
----------------------------------------------------------------------
odbc/.gitignore | 2 ++
odbc/Common/Common.vcxproj | 8 ++++----
odbc/Common/Win32/Debug/.gitignore | 2 ++
odbc/Common/x64/Debug/.gitignore | 2 ++
odbc/Driver/Win32/Debug/.gitignore | 1 +
odbc/Driver/Win32/Debug/Intermediate/.gitignore | 2 ++
odbc/Driver/driver.vcxproj | 8 ++++----
odbc/Driver/x64/Debug/Intermediate/.gitignore | 2 ++
8 files changed, 19 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/47746435/odbc/.gitignore
----------------------------------------------------------------------
diff --git a/odbc/.gitignore b/odbc/.gitignore
index bc31b54..a26a39a 100644
--- a/odbc/.gitignore
+++ b/odbc/.gitignore
@@ -34,3 +34,5 @@
*.suo
+/UpgradeLog.*
+/_UpgradeReport_files*
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/47746435/odbc/Common/Common.vcxproj
----------------------------------------------------------------------
diff --git a/odbc/Common/Common.vcxproj b/odbc/Common/Common.vcxproj
index fe2f63b..9b707cd 100644
--- a/odbc/Common/Common.vcxproj
+++ b/odbc/Common/Common.vcxproj
@@ -68,24 +68,24 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<IncludePath>$(CPPREST_HOME)\Release\include;$(IncludePath)</IncludePath>
- <LibraryPath>$(CPPREST_HOME)\Binaries\Win32\Release;$(LibraryPath)</LibraryPath>
+ <LibraryPath>$(CPPREST_HOME)\Binaries\$(Platform)\$(Configuration);$(LibraryPath)</LibraryPath>
<OutDir>$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IncludePath>$(CPPREST_HOME)\Release\include;$(IncludePath)</IncludePath>
- <LibraryPath>$(CPPREST_HOME)\Binaries\Release64;$(LibraryPath)</LibraryPath>
+ <LibraryPath>$(CPPREST_HOME)\Binaries\$(Platform)\$(Configuration);$(LibraryPath)</LibraryPath>
<OutDir>$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>$(CPPREST_HOME)\Release\include;C:\Program Files %28x86%29\Visual Leak Detector\include;$(IncludePath)</IncludePath>
- <LibraryPath>$(CPPREST_HOME)\Binaries\Win32\Debug;C:\Program Files %28x86%29\Visual Leak Detector\lib\Win32;$(LibraryPath)</LibraryPath>
+ <LibraryPath>$(CPPREST_HOME)\Binaries\$(Platform)\$(Configuration);C:\Program Files %28x86%29\Visual Leak Detector\lib\Win32;$(LibraryPath)</LibraryPath>
<OutDir>$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>$(CPPREST_HOME)\Release\include;$(IncludePath)</IncludePath>
- <LibraryPath>$(CPPREST_HOME)\Binaries\Debug64;$(LibraryPath)</LibraryPath>
+ <LibraryPath>$(CPPREST_HOME)\Binaries\$(Platform)\$(Configuration);$(LibraryPath)</LibraryPath>
<OutDir>$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/47746435/odbc/Common/Win32/Debug/.gitignore
----------------------------------------------------------------------
diff --git a/odbc/Common/Win32/Debug/.gitignore b/odbc/Common/Win32/Debug/.gitignore
new file mode 100644
index 0000000..6b4ec49
--- /dev/null
+++ b/odbc/Common/Win32/Debug/.gitignore
@@ -0,0 +1,2 @@
+*.idb
+*.lastbuildstate
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/47746435/odbc/Common/x64/Debug/.gitignore
----------------------------------------------------------------------
diff --git a/odbc/Common/x64/Debug/.gitignore b/odbc/Common/x64/Debug/.gitignore
new file mode 100644
index 0000000..6b4ec49
--- /dev/null
+++ b/odbc/Common/x64/Debug/.gitignore
@@ -0,0 +1,2 @@
+*.idb
+*.lastbuildstate
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/47746435/odbc/Driver/Win32/Debug/.gitignore
----------------------------------------------------------------------
diff --git a/odbc/Driver/Win32/Debug/.gitignore b/odbc/Driver/Win32/Debug/.gitignore
new file mode 100644
index 0000000..829cc2e
--- /dev/null
+++ b/odbc/Driver/Win32/Debug/.gitignore
@@ -0,0 +1 @@
+*.idb
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/47746435/odbc/Driver/Win32/Debug/Intermediate/.gitignore
----------------------------------------------------------------------
diff --git a/odbc/Driver/Win32/Debug/Intermediate/.gitignore b/odbc/Driver/Win32/Debug/Intermediate/.gitignore
new file mode 100644
index 0000000..1f47da5
--- /dev/null
+++ b/odbc/Driver/Win32/Debug/Intermediate/.gitignore
@@ -0,0 +1,2 @@
+*.res
+*.lastbuildstate
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/47746435/odbc/Driver/driver.vcxproj
----------------------------------------------------------------------
diff --git a/odbc/Driver/driver.vcxproj b/odbc/Driver/driver.vcxproj
index 90533a9..4785df1 100644
--- a/odbc/Driver/driver.vcxproj
+++ b/odbc/Driver/driver.vcxproj
@@ -96,12 +96,12 @@
<IntDir>$(Platform)\$(Configuration)\Intermediate\</IntDir>
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(CPPREST_HOME)\Release\include;$(SolutionDir)\Common;$(IncludePath)</IncludePath>
- <LibraryPath>$(CPPREST_HOME)\Binaries\Win32\Release;$(SolutionDir)\Common\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
+ <LibraryPath>$(CPPREST_HOME)\Binaries\$(Platform)\$(Configuration);$(SolutionDir)\Common\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(CPPREST_HOME)\Release\include;$(SolutionDir)\Common\;$(IncludePath)</IncludePath>
- <LibraryPath>$(CPPREST_HOME)\Binaries\Release64;$(SolutionDir)\Common\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
+ <LibraryPath>$(CPPREST_HOME)\Binaries\$(Platform)\$(Configuration);$(SolutionDir)\Common\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
<OutDir>$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\Intermediate\</IntDir>
</PropertyGroup>
@@ -110,12 +110,12 @@
<IntDir>$(Platform)\$(Configuration)\Intermediate\</IntDir>
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(CPPREST_HOME)\Release\include;$(SolutionDir)\Common\;C:\Program Files %28x86%29\Visual Leak Detector\include;$(IncludePath)</IncludePath>
- <LibraryPath>$(SolutionDir)\Common\$(Platform)\$(Configuration)\;C:\Program Files %28x86%29\Visual Leak Detector\lib\Win32;$(CPPREST_HOME)\Binaries\Win32\Debug;$(LibraryPath)</LibraryPath>
+ <LibraryPath>$(CPPREST_HOME)\Binaries\$(Platform)\$(Configuration);$(SolutionDir)\Common\$(Platform)\$(Configuration)\;C:\Program Files %28x86%29\Visual Leak Detector\lib\Win32;$(LibraryPath)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(CPPREST_HOME)\Release\include;$(SolutionDir)\Common\;$(IncludePath)</IncludePath>
- <LibraryPath>$(CPPREST_HOME)\Binaries\Debug64;$(SolutionDir)\Common\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
+ <LibraryPath>$(CPPREST_HOME)\Binaries\$(Platform)\$(Configuration);$(SolutionDir)\Common\$(Platform)\$(Configuration)\;$(LibraryPath)</LibraryPath>
<OutDir>$(Platform)\$(Configuration)\</OutDir>
<IntDir>$(Platform)\$(Configuration)\Intermediate\</IntDir>
</PropertyGroup>
http://git-wip-us.apache.org/repos/asf/incubator-kylin/blob/47746435/odbc/Driver/x64/Debug/Intermediate/.gitignore
----------------------------------------------------------------------
diff --git a/odbc/Driver/x64/Debug/Intermediate/.gitignore b/odbc/Driver/x64/Debug/Intermediate/.gitignore
new file mode 100644
index 0000000..1f47da5
--- /dev/null
+++ b/odbc/Driver/x64/Debug/Intermediate/.gitignore
@@ -0,0 +1,2 @@
+*.res
+*.lastbuildstate