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/23028Reviewed-by: Alexis Hétu <sugoi@google.com> Tested-by: Chris Forbes <chrisforbes@google.com>

Fix the CMake build
f8374cf0 · Chris Forbes · 0ab9f3be · f8374cf0 · f8374cf0
Commit f8374cf0 authored Dec 06, 2018 by Chris Forbes
Hide whitespace changes
Inline Side-by-side

Showing with 10 additions and 3 deletions

CMakeLists.txt CMakeLists.txt +7 -1

VkCommandBuffer.cpp src/Vulkan/VkCommandBuffer.cpp +3 -2

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -198,7 +198,7 @@ if(MSVC)
    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 @@ file(GLOB_RECURSE EGL_LIST
    ${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 @@ file(GLOB_RECURSE GLES2_LIST
    ${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 @@ file(GLOB_RECURSE GLES_CM_LIST
    ${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
 )

--- 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 @@ void CommandBuffer::submit()
 	state = EXECUTABLE;
 }

-} // namespace vk
\ No newline at end of file
+} // namespace vk