summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt18
-rw-r--r--src/CMakeLists.txt1
2 files changed, 12 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 254d4f2..047c995 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,7 @@
# Copyright 2017 Edward O'Callaghan <funfunctor@folklore1984.net>
-cmake_minimum_required(VERSION 3.0.1)
+#cmake_minimum_required(VERSION 3.7.2)
+cmake_minimum_required(VERSION 3.6.2)
project(learning_vk)
@@ -16,13 +17,16 @@ add_definitions(-DUMR_BUILD_REV=\"${GIT_REV}\")
# Add local repository for FindXXX.cmake modules.
SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/" ${CMAKE_MODULE_PATH})
-#find_package(Curses REQUIRED)
-#include_directories(${CURSES_INCLUDE_DIRS})
+find_package(Vulkan REQUIRED)
+include_directories(${Vulkan_INCLUDE_DIRS})
-#set(REQUIRED_EXTERNAL_LIBS
-# ${CURSES_LIBRARIES}
-# ${PCIACCESS_LIBRARIES}
-#)
+find_package(GLFW REQUIRED)
+include_directories(${GLFW_INCLUDE_DIR})
+
+set(REQUIRED_EXTERNAL_LIBS
+ ${Vulkan_LIBRARIES}
+ ${GLFW_LIBRARIES}
+)
# Global setting: build everything position independent
#set(CMAKE_POSITION_INDEPENDENT_CODE ON)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 743404c..f245282 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,5 +11,6 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/)
add_executable(${PROJECT_NAME} main.cpp)
#target_link_libraries(umr umrapp)
+target_link_libraries(${PROJECT_NAME} ${REQUIRED_EXTERNAL_LIBS})
install(TARGETS ${PROJECT_NAME} DESTINATION bin)