diff -r 41b0a9955c47 -r ddcdedd3330b misc/liblua/CMakeLists.txt --- a/misc/liblua/CMakeLists.txt Thu Nov 24 13:44:30 2011 +0100 +++ b/misc/liblua/CMakeLists.txt Sun Oct 28 13:28:23 2012 +0100 @@ -1,19 +1,19 @@ +#this file is included only when system Lua library is not found + file(GLOB lua_src *.c *.h) -set(LIBRARY_OUTPUT_PATH ${EXECUTABLE_OUTPUT_PATH}) + +if(WIN32) + add_definitions(-DLUA_BUILD_AS_DLL) + add_library(lua SHARED ${lua_src}) -IF(APPLE) - set(build_type STATIC) - add_definitions(-DLUA_USE_LINUX) - add_library (lua ${build_type} ${lua_src}) -ENDIF(APPLE) + set(LUA_LIBRARY lua.dll) -IF(WIN32) - set(build_type SHARED) - add_definitions(-DLUA_BUILD_AS_DLL) - add_library (lua ${build_type} ${lua_src}) - - SET_TARGET_PROPERTIES(lua PROPERTIES PREFIX "") - install(TARGETS lua RUNTIME DESTINATION ${target_dir}) + set_target_properties(lua PROPERTIES PREFIX "") + install(TARGETS lua RUNTIME DESTINATION ${target_dir}) +else(WIN32) + add_definitions(-DLUA_USE_LINUX) + add_library(lua STATIC ${lua_src}) + set(LUA_LIBRARY lua) endif(WIN32)