diff options
| author | Matthias Schiffer <mschiffer@universe-factory.net> | 2015-02-14 21:27:42 +0100 |
|---|---|---|
| committer | Matthias Schiffer <mschiffer@universe-factory.net> | 2015-02-14 21:27:42 +0100 |
| commit | f05141f1f78d9e0d917b2cc07f0fb09fd7f62801 (patch) | |
| tree | b1cf041fd21359c260e924018c334e157db55f68 | |
| parent | 12cf10a35ca156e4d34f5b2154e01484fdfaf41c (diff) | |
| download | rpgedit-f05141f1f78d9e0d917b2cc07f0fb09fd7f62801.tar rpgedit-f05141f1f78d9e0d917b2cc07f0fb09fd7f62801.zip | |
Find only Lua 5.2
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/CMakeLists.txt | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d575ce..0cdd80d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ project(RPGEDIT CXX) find_package(PkgConfig REQUIRED) pkg_check_modules(SDL2 REQUIRED sdl2 SDL2_image) -pkg_check_modules(LUA REQUIRED lua>=5.2) +find_package(Lua 5.2 EXACT REQUIRED) add_subdirectory(src) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3ba9985..3e7dd61 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,5 @@ -include_directories(${SDL2_INCLUDE_DIRS} ${LUA_INCLUDE_DIRS}) -link_directories(${SDL2_LIBRARY_DIRS} ${LUA_LIBRARY_DIRS}) +include_directories(${SDL2_INCLUDE_DIRS} ${LUA_INCLUDE_DIR}) +link_directories(${SDL2_LIBRARY_DIRS}) add_executable(rpgedit rpgedit.cpp @@ -10,6 +10,6 @@ add_executable(rpgedit view/MapView.cpp view/SpriteCache.cpp ) -set_target_properties(rpgedit PROPERTIES COMPILE_FLAGS "-std=c++11 -Wall ${SDL2_CFLAGS_OTHER} ${LUA_CFLAGS_OTHER}") -set_target_properties(rpgedit PROPERTIES LINK_FLAGS "${SDL2_LDFLAGS_OTHER} ${LUA_LDFLAGS_OTHER}") +set_target_properties(rpgedit PROPERTIES COMPILE_FLAGS "-std=c++11 -Wall ${SDL2_CFLAGS_OTHER}") +set_target_properties(rpgedit PROPERTIES LINK_FLAGS "${SDL2_LDFLAGS_OTHER}") target_link_libraries(rpgedit ${SDL2_LIBRARIES} ${LUA_LIBRARIES}) |