Fix the CMake build
One part of this might change -- master contains some uses of
std::make_unique which Alexis might get rid of.
Change-Id: I40ae17f4e88920c4d60b79e1d4b117a7800fcd82
Reviewed-on: https://swiftshader-review.googlesource.com/c/23028
Reviewed-by: Alexis Hétu <sugoi@google.com>
Tested-by: Chris Forbes <chrisforbes@google.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0068ffb..088be06 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,7 +198,7 @@
set_cpp_flag("/MP")
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
else()
- set_cpp_flag("--std=c++11")
+ set_cpp_flag("--std=c++14")
set_cpp_flag("-Wall")
set_cpp_flag("-Werror=reorder")
set_cpp_flag("-Werror=sign-compare")
@@ -1935,6 +1935,8 @@
${OPENGL_DIR}/common/Object.hpp
${OPENGL_DIR}/common/debug.cpp
${OPENGL_DIR}/common/debug.h
+ ${SOURCE_DIR}/Common/SharedLibrary.cpp
+ ${SOURCE_DIR}/Common/SharedLibrary.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/*.h
)
@@ -1945,6 +1947,8 @@
${OPENGL_DIR}/common/*.cpp
${OPENGL_DIR}/common/*.h
${OPENGL_DIR}/common/*.hpp
+ ${SOURCE_DIR}/Common/SharedLibrary.cpp
+ ${SOURCE_DIR}/Common/SharedLibrary.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/KHR/*.h
${CMAKE_CURRENT_SOURCE_DIR}/include/GLES2/*.h
${CMAKE_CURRENT_SOURCE_DIR}/include/GLES3/*.h
@@ -1957,6 +1961,8 @@
${OPENGL_DIR}/common/*.cpp
${OPENGL_DIR}/common/*.h
${OPENGL_DIR}/common/*.hpp
+ ${SOURCE_DIR}/Common/SharedLibrary.cpp
+ ${SOURCE_DIR}/Common/SharedLibrary.hpp
${CMAKE_CURRENT_SOURCE_DIR}/include/KHR/*.h
${CMAKE_CURRENT_SOURCE_DIR}/include/GLES/*.h
)
diff --git a/src/Vulkan/VkCommandBuffer.cpp b/src/Vulkan/VkCommandBuffer.cpp
index 45f9199..dbcb386 100644
--- a/src/Vulkan/VkCommandBuffer.cpp
+++ b/src/Vulkan/VkCommandBuffer.cpp
@@ -14,6 +14,8 @@
#include "VkCommandBuffer.hpp"
+#include <cstring>
+
namespace vk
{
@@ -524,4 +526,4 @@
state = EXECUTABLE;
}
-} // namespace vk
\ No newline at end of file
+} // namespace vk