From fdb92ef24ff4d271495b6d61abaf06d16b1b8a49 Mon Sep 17 00:00:00 2001 From: Linus Probert Date: Tue, 5 Dec 2017 12:40:37 +0100 Subject: [PATCH] Better cmake --- .travis.yml | 2 +- CMakeLists.txt | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8763eb0..910c0db 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ before_install: install: - sudo apt-get install -y libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev - - sudo apt-get install -y cmake cmake-data check lua5.3 liblua5.3-dev + - sudo apt-get install -y cmake cmake-data check lua5.2 liblua5.2-dev #g++6 - if [ "$CXX" = "g++" ]; then sudo apt-get install -y g++-6; fi diff --git a/CMakeLists.txt b/CMakeLists.txt index 843c367..a1bc052 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,14 @@ SET(CMAKE_COLOR_MAKEFILE ON) project(breakhack C) +include(FindLua) + add_subdirectory(linkedlist) -include_directories(linkedlist) + +include_directories(linkedlist + ${LUA_INCLUDE_DIRS} + ) + add_definitions("-Wall") # PROGRAMS: @@ -24,13 +30,13 @@ add_executable(breakhack target_link_libraries(breakhack linkedlist + ${LUA_LIBRARIES} -lSDL2 -lSDL2_image -lSDL2_mixer -lSDL2_ttf -lX11 -lXrandr - -llua ) # TESTS: