diff options
| author | Stefan Radomski <github@mintwerk.de> | 2016-08-26 13:01:27 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2016-08-26 13:01:27 (GMT) |
| commit | 1a1513c6497e8818eb2a92a8fbf77d4c60bc911e (patch) | |
| tree | 6c627814e4c9a4cb972cc3a5f958a5b52a7d766e | |
| parent | 6cb75c5b3c24940b78ad6c3219fa0471a572b1e2 (diff) | |
| download | uscxml-1a1513c6497e8818eb2a92a8fbf77d4c60bc911e.zip uscxml-1a1513c6497e8818eb2a92a8fbf77d4c60bc911e.tar.gz uscxml-1a1513c6497e8818eb2a92a8fbf77d4c60bc911e.tar.bz2 | |
Restored support for cmake 2.8.12
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/bindings/swig/lua/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/uscxml/plugins/datamodel/CMakeLists.txt | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 30fefeb..1466df7 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -361,8 +361,8 @@ if (WITH_DM_LUA) # LuaForWindows https://code.google.com/archive/p/luaforwindows/downloads set(ENV{LUA_DIR} "C:/Program Files (x86)/Lua/5.1/") endif() - find_package(Lua) - if (LUA_FOUND) + find_package(Lua51) + if (LUA51_FOUND) include_directories (${LUA_INCLUDE_DIR}) include_directories(${PROJECT_SOURCE_DIR}/contrib/src/LuaBridge) list (APPEND USCXML_OPT_LIBS ${LUA_LIBRARIES}) diff --git a/src/bindings/swig/lua/CMakeLists.txt b/src/bindings/swig/lua/CMakeLists.txt index 344edec..93accad 100644 --- a/src/bindings/swig/lua/CMakeLists.txt +++ b/src/bindings/swig/lua/CMakeLists.txt @@ -1,8 +1,8 @@ # generate JNI library and create a jar # Make from within Eclipse fails miserably with the whole thing -find_package(Lua) -if(LUA_FOUND) +find_package(Lua51) +if(LUA51_FOUND) include_directories(${LUA_INCLUDE_DIR}) else() message(STATUS "No Lua headers found - not building Lua wrappers") diff --git a/src/uscxml/plugins/datamodel/CMakeLists.txt b/src/uscxml/plugins/datamodel/CMakeLists.txt index 4004ef2..fd08ee0 100644 --- a/src/uscxml/plugins/datamodel/CMakeLists.txt +++ b/src/uscxml/plugins/datamodel/CMakeLists.txt @@ -36,7 +36,7 @@ if (V8_FOUND) endif() -if (LUA_FOUND) +if (LUA51_FOUND) set(USCXML_DATAMODELS "lua ${USCXML_DATAMODELS}") # Lua ecmascript datamodel file(GLOB LUA_DATAMODEL @@ -100,7 +100,7 @@ else() endif() - if (LUA_FOUND) + if (LUA51_FOUND) add_custom_target(lua-bindings COMMAND ${SWIG_EXECUTABLE} -I${XercesC_INCLUDE_DIRS} |