diff options
| author | Přemysl Janouch <p@janouch.name> | 2018-06-25 00:02:11 +0200 |
|---|---|---|
| committer | Přemysl Janouch <p@janouch.name> | 2018-06-25 02:34:35 +0200 |
| commit | b5af31b048e3d78343d82bd713946caa5fac6690 (patch) | |
| tree | 7cd128a4019c1ea22b3633652c3063fa25f0bdb4 /CMakeLists.txt | |
| parent | c09acf120cf03aa95964e45b52be95d9047f20c6 (diff) | |
| download | logdiag-b5af31b048e3d78343d82bd713946caa5fac6690.tar.gz logdiag-b5af31b048e3d78343d82bd713946caa5fac6690.tar.xz logdiag-b5af31b048e3d78343d82bd713946caa5fac6690.zip | |
Fix Lua cross-build, bump the Win32 version
Something has changed and it could no longer find the include files.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 06af0be..206c93c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,18 +80,7 @@ endif (CONVERT_EXECUTABLE AND NOT WIN32) # Dependencies find_package (PkgConfig REQUIRED) pkg_check_modules (GTK3 REQUIRED gtk+-3.0 json-glib-1.0) - -if (NOT WIN32) - pkg_search_module (Lua REQUIRED lua>=5.2 lua5.3 lua-5.3 lua5.2 lua-5.2) -else (NOT WIN32) - # XXX: this seems to require CMake 3.0 ... include it in the project? - find_package (Lua REQUIRED) - if (NOT LUA_FOUND OR LUA_VERSION_STRING VERSION_LESS "5.2") - message (FATAL_ERROR "Lua 5.2 not found") - endif (NOT LUA_FOUND OR LUA_VERSION_STRING VERSION_LESS "5.2") - set (Lua_LIBRARIES ${LUA_LIBRARIES}) - set (Lua_INCLUDE_DIRS ${LUA_INCLUDE_DIR}) -endif (NOT WIN32) +pkg_search_module (Lua REQUIRED lua>=5.2 lua5.3 lua-5.3 lua5.2 lua-5.2) # This actually fucks up MinGW cross-compilation if omitted link_directories (${GTK3_LIBRARY_DIRS}) |