From e807e76ebf910e9e0288c23706f21c145c12ac20 Mon Sep 17 00:00:00 2001 From: Bastien Date: Wed, 19 Sep 2018 13:27:12 +0200 Subject: [PATCH] Improved CMake --- CMakeLists.txt | 20 ++------------------ src/CMakeLists.txt | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 src/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt index 8603eb4..a88134c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,23 +10,7 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN ON) set(CMAKE_C_STANDARD 99) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -ansi -pedantic -Werror=implicit-function-declaration -Werror=incompatible-pointer-types") -option(ENABLE_XCB "Enable XCB" ON) - -find_package(OpenGL REQUIRED) -find_package(OpenHMD REQUIRED) - -add_library(lvrc include/lvrc.h src/lvrc.c src/lvrc_internal.h src/instance.c src/instance.h src/swapChain.c src/swapChain.h src/frame.c src/frame.h) - -target_link_libraries(lvrc PUBLIC openhmd ${OPENGL_LIBRARIES} EGL) -target_link_libraries(lvrc PUBLIC "drm" "gbm") -target_include_directories(lvrc PRIVATE "/usr/include/drm/") -target_include_directories(lvrc PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include") - -if (ENABLE_XCB) - target_link_libraries(lvrc PUBLIC "xcb" "xcb-randr") - target_compile_definitions(lvrc PRIVATE ENABLE_XCB=1) -endif(ENABLE_XCB) +add_subdirectory(src) +add_subdirectory(examples) export(TARGETS lvrc FILE lvrc-config.cmake) - -add_subdirectory(examples) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 0000000..e6e5669 --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,16 @@ + +find_package(OpenGL REQUIRED) +find_package(OpenHMD REQUIRED) + +add_library(lvrc ../include/lvrc.h lvrc.c lvrc_internal.h instance.c instance.h swapChain.c swapChain.h frame.c frame.h) + +target_link_libraries(lvrc PUBLIC openhmd ${OPENGL_LIBRARIES} EGL) +target_link_libraries(lvrc PUBLIC "drm" "gbm") +target_include_directories(lvrc PRIVATE "/usr/include/drm/") +target_include_directories(lvrc PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/../include") + +if (ENABLE_XCB) + target_link_libraries(lvrc PUBLIC "xcb" "xcb-randr") + target_compile_definitions(lvrc PRIVATE ENABLE_XCB=1) +endif(ENABLE_XCB) +