Mercurial > code
changeset 487:d061bad36315
Fix various case-sensitive includes and resources not copied
| author | David Demelier <markand@malikania.fr> |
|---|---|
| date | Fri, 13 Nov 2015 09:50:52 +0100 |
| parents | 7ee8da32da98 |
| children | b280d7aca160 |
| files | cmake/CodeFunctions.cmake modules/dynlib/CMakeLists.txt modules/json/json.cpp modules/json/json.h modules/sockets/test/main.cpp modules/unicode/test/main.cpp |
| diffstat | 6 files changed, 43 insertions(+), 25 deletions(-) [+] |
line wrap: on
line diff
--- a/cmake/CodeFunctions.cmake Fri Nov 13 09:26:46 2015 +0100 +++ b/cmake/CodeFunctions.cmake Fri Nov 13 09:50:52 2015 +0100 @@ -39,29 +39,38 @@ COMMAND ${CMAKE_COMMAND} -E copy ${res} ${output} ) - list(APPEND ${MOD_SOURCES} ${output}) + list(APPEND MOD_SOURCES ${output}) endforeach() endif () # # Finally create the executable and the test # - add_executable(${MOD_NAME} ${MOD_SOURCES} ${MOD_RESOURCES} ${MAIN}) + add_executable(test-${MOD_NAME} ${MOD_SOURCES} ${MOD_RESOURCES} ${MAIN}) add_test( - NAME ${MOD_NAME}-test - COMMAND ${MOD_NAME} + NAME ${MOD_NAME} + COMMAND test-${MOD_NAME} WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) - target_compile_definitions(${MOD_NAME} PRIVATE ${MOD_FLAGS}) + set_target_properties( + test-${MOD_NAME} + PROPERTIES + RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} + RUNTIME_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR} + RUNTIME_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR} + RUNTIME_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR} + RUNTIME_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR} + ) + target_compile_definitions(test-${MOD_NAME} PRIVATE ${MOD_FLAGS}) target_include_directories( - ${MOD_NAME} + test-${MOD_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR} ${MOD_INCLUDES} ) - target_link_libraries(${MOD_NAME} gtest ${MOD_LIBRARIES}) + target_link_libraries(test-${MOD_NAME} gtest ${MOD_LIBRARIES}) endif () endif () -endfunction() \ No newline at end of file +endfunction()
--- a/modules/dynlib/CMakeLists.txt Fri Nov 13 09:26:46 2015 +0100 +++ b/modules/dynlib/CMakeLists.txt Fri Nov 13 09:50:52 2015 +0100 @@ -44,6 +44,15 @@ if (WITH_DYNLIB) # Add a fake plugin add_library(dynlib-plugin MODULE ${dynlib_SOURCE_DIR}/test/Plugin.cpp) - set_target_properties(dynlib-plugin PROPERTIES PREFIX "") + set_target_properties( + dynlib-plugin + PROPERTIES + PREFIX "" + LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR} + LIBRARY_OUTPUT_DIRECTORY_DEBUG ${CMAKE_BINARY_DIR} + LIBRARY_OUTPUT_DIRECTORY_RELEASE ${CMAKE_BINARY_DIR} + LIBRARY_OUTPUT_DIRECTORY_RELWITHDEBINFO ${CMAKE_BINARY_DIR} + LIBRARY_OUTPUT_DIRECTORY_MINSIZEREL ${CMAKE_BINARY_DIR} + ) target_include_directories(dynlib-plugin PRIVATE ${dynlib_SOURCE_DIR}) endif ()
--- a/modules/json/json.cpp Fri Nov 13 09:26:46 2015 +0100 +++ b/modules/json/json.cpp Fri Nov 13 09:50:52 2015 +0100 @@ -128,7 +128,7 @@ { switch (other.m_type) { case Type::Array: - new (&m_array) std::deque<Value>(other.m_array); + new (&m_array) std::vector<Value>(other.m_array); break; case Type::Boolean: m_boolean = other.m_boolean; @@ -156,7 +156,7 @@ { switch (other.m_type) { case Type::Array: - new (&m_array) std::deque<Value>(std::move(other.m_array)); + new (&m_array) std::vector<Value>(std::move(other.m_array)); break; case Type::Boolean: m_boolean = other.m_boolean; @@ -185,7 +185,7 @@ { switch (m_type) { case Type::Array: - new (&m_array) std::deque<Value>(); + new (&m_array) std::vector<Value>(); break; case Type::Boolean: m_boolean = false; @@ -211,7 +211,7 @@ { switch (m_type) { case Type::Array: - m_array.~deque<Value>(); + m_array.~vector<Value>(); break; case Type::Object: m_object.~map<std::string, Value>();
--- a/modules/json/json.h Fri Nov 13 09:26:46 2015 +0100 +++ b/modules/json/json.h Fri Nov 13 09:50:52 2015 +0100 @@ -34,7 +34,7 @@ #include <map> #include <string> #include <utility> -#include <deque> +#include <vector> /** * Json namespace. @@ -178,7 +178,7 @@ bool m_boolean; int m_integer; std::string m_string; - std::deque<Value> m_array; + std::vector<Value> m_array; std::map<std::string, Value> m_object; }; @@ -349,12 +349,12 @@ /** * Forward iterator. */ - using iterator = BaseIterator<Value, typename std::deque<Value>::iterator, typename std::map<std::string, Value>::iterator>; + using iterator = BaseIterator<Value, typename std::vector<Value>::iterator, typename std::map<std::string, Value>::iterator>; /** * Const forward iterator. */ - using const_iterator = BaseIterator<const Value, typename std::deque<Value>::const_iterator, typename std::map<std::string, Value>::const_iterator>; + using const_iterator = BaseIterator<const Value, typename std::vector<Value>::const_iterator, typename std::map<std::string, Value>::const_iterator>; /** * Construct a null value. @@ -451,12 +451,12 @@ } /** - * Create an array from a deque. + * Create an array from a vector. * * @param values the values * @see fromArray */ - inline Value(std::deque<Value> values) + inline Value(std::vector<Value> values) : Value{Type::Array} { for (Value value : values) { @@ -855,7 +855,7 @@ { assert(isArray()); - m_array.push_front(value); + m_array.insert(m_array.begin(), value); } /** @@ -868,7 +868,7 @@ { assert(isArray()); - m_array.push_front(std::move(value)); + m_array.insert(m_array.begin(), std::move(value)); } /** @@ -1142,7 +1142,7 @@ */ inline Value array(std::initializer_list<Value> values) { - return Value(std::deque<Value>(values.begin(), values.end())); + return Value(std::vector<Value>(values.begin(), values.end())); } /**
--- a/modules/sockets/test/main.cpp Fri Nov 13 09:26:46 2015 +0100 +++ b/modules/sockets/test/main.cpp Fri Nov 13 09:50:52 2015 +0100 @@ -637,8 +637,8 @@ { Tls protocol; - protocol.setCertificate("Socket/test.crt"); - protocol.setPrivateKey("Socket/test.key"); + protocol.setCertificate("sockets/test.crt"); + protocol.setPrivateKey("sockets/test.key"); protocol.setVerify(false); m_server = SocketTls<Ip>{std::move(protocol)};