From 3a43ac0b94f1bb1705a8c8a0d615f302e0ee92c4 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Thu, 10 Mar 2016 07:09:31 +0100 Subject: [PATCH 1/3] Add missing ws2_lib32.lib Signed-off-by: FrancisANDRE --- Redis/testsuite/TestSuite.progen | 2 + Redis/testsuite/TestSuite_vs120.vcxproj | 62 ++++++++++---------- Redis/testsuite/TestSuite_x64_vs120.vcxproj | 64 ++++++++++----------- 3 files changed, 65 insertions(+), 63 deletions(-) diff --git a/Redis/testsuite/TestSuite.progen b/Redis/testsuite/TestSuite.progen index feb5c6909..178b5a446 100644 --- a/Redis/testsuite/TestSuite.progen +++ b/Redis/testsuite/TestSuite.progen @@ -7,3 +7,5 @@ vc.project.platforms = Win32, x64 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_x64_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\Net\\include +vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib +vc.project.linker.dependencies.x64 = ws2_32.lib iphlpapi.lib diff --git a/Redis/testsuite/TestSuite_vs120.vcxproj b/Redis/testsuite/TestSuite_vs120.vcxproj index def498763..96f652e6c 100644 --- a/Redis/testsuite/TestSuite_vs120.vcxproj +++ b/Redis/testsuite/TestSuite_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -63,27 +63,27 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>12.0.21005.1 TestSuited @@ -136,7 +136,7 @@ true true true - + Level3 ProgramDatabase Default @@ -167,9 +167,9 @@ true true true - + Level3 - + Default @@ -196,13 +196,13 @@ true true true - + Level3 ProgramDatabase Default - PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -227,13 +227,13 @@ true true true - + Level3 - + Default - PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -256,7 +256,7 @@ true true true - + Level3 ProgramDatabase Default @@ -287,13 +287,13 @@ true true true - + Level3 - + Default - PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -304,14 +304,14 @@ - - - + + + - - + + - - - + + + \ No newline at end of file diff --git a/Redis/testsuite/TestSuite_x64_vs120.vcxproj b/Redis/testsuite/TestSuite_x64_vs120.vcxproj index 38716e311..2c9273a08 100644 --- a/Redis/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Redis/testsuite/TestSuite_x64_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -63,27 +63,27 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>12.0.21005.1 TestSuited @@ -136,7 +136,7 @@ true true true - + Level3 ProgramDatabase Default @@ -167,9 +167,9 @@ true true true - + Level3 - + Default @@ -196,13 +196,13 @@ true true true - + Level3 ProgramDatabase Default - PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmtd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -227,13 +227,13 @@ true true true - + Level3 - + Default - PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmt.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -256,13 +256,13 @@ true true true - + Level3 ProgramDatabase Default - PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -287,13 +287,13 @@ true true true - + Level3 - + Default - PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -304,14 +304,14 @@ - - - + + + - - + + - - - + + + \ No newline at end of file From 47461e041f3638475cee51ed864f2705b4bfffaf Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Thu, 10 Mar 2016 12:22:48 +0100 Subject: [PATCH 2/3] Add missing ws2_lib32.lib Signed-off-by: FrancisANDRE --- Redis/testsuite/TestSuite_vs120.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Redis/testsuite/TestSuite_vs120.vcxproj b/Redis/testsuite/TestSuite_vs120.vcxproj index 96f652e6c..78e04fff9 100644 --- a/Redis/testsuite/TestSuite_vs120.vcxproj +++ b/Redis/testsuite/TestSuite_vs120.vcxproj @@ -262,7 +262,7 @@ Default - PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + PocoCppUnitmdd.lib;ws2_32.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true From ca49ef5d955b77e1f1b9c34f26ee0e86644fc295 Mon Sep 17 00:00:00 2001 From: FrancisANDRE Date: Thu, 10 Mar 2016 13:13:42 +0100 Subject: [PATCH 3/3] Run Data/SQLite on Travis OSX Signed-off-by: FrancisANDRE --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index eb167d29a..d82df67ed 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,7 +55,7 @@ matrix: - export CC="clang" - export CXX="clang++" - clang++ -x c++ /dev/null -dM -E - - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/SQLite,Data/PostgreSQL && make -s -j2 + - ./configure --everything --omit=Data/ODBC,Data/MySQL,Data/PostgreSQL && make -s -j2 - sudo make install - ./travis/OSX/runtests.sh