Fix tests

logandk · Apr 2, 2013 · a4e527f · a4e527f
1 parent 303db0d
commit a4e527f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -25,13 +25,13 @@ link_directories(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/iconv/lib)
 
 FILE(GLOB test_files "test_*.cpp")
 add_executable(tests ${test_files})
-target_link_libraries(tests gtest gtest_main restful_mapper yajl curl)
+target_link_libraries(tests gtest gtest_main restful_mapper yajl)
 
 if (WIN32)
-  target_link_libraries(tests ws2_32 iconv charset)
+  target_link_libraries(tests ws2_32 iconv charset libcurl)
 endif()
 
 if (UNIX)
-  target_link_libraries(tests idn pthread)
+  target_link_libraries(tests idn pthread curl)
 endif()
 
diff --git a/tests/test_query.cpp b/tests/test_query.cpp
@@ -4,6 +4,7 @@
 #include <gtest/gtest.h>
 #include <restful_mapper/query.h>
 #include <restful_mapper/internal/iso8601.h>
+#include <restful_mapper/internal/utf8.h>
 
 using namespace std;
 using namespace restful_mapper;

diff --git a/vendor/iconv/patch.cmake b/vendor/iconv/patch.cmake
@@ -1,7 +1,3 @@
-execute_process(COMMAND ${CMAKE_COMMAND} -E copy
-  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt
-  ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt.bak)
-
 execute_process(COMMAND ${CMAKE_COMMAND} -E copy
   ${CMAKE_CURRENT_SOURCE_DIR}/../../CMakeLists.txt
   ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt)