From 3b4aabe16c5a328cadd673dcc913089b8bf676cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Draho=C5=A1?= Date: Sun, 3 Oct 2010 15:37:24 +0200 Subject: Lua will now build lua51.dll for compatibility reasons. Added archive destination to install targets. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aec7a70..571af64 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,7 +44,7 @@ SET ( SRC_LIBLUA src/lapi.c src/lcode.c src/ldebug.c src/ldo.c src/ldump.c src/l ADD_LIBRARY ( liblua SHARED ${SRC_LIBLUA} ${DEF_FILE} ${DLL_RC_FILE}) TARGET_LINK_LIBRARIES ( liblua ${LIBS}) -SET_TARGET_PROPERTIES ( liblua PROPERTIES OUTPUT_NAME lua CLEAN_DIRECT_OUTPUT 1 ) +SET_TARGET_PROPERTIES ( liblua PROPERTIES OUTPUT_NAME lua51 CLEAN_DIRECT_OUTPUT 1 ) ADD_LIBRARY ( liblua_static ${SRC_LIBLUA} ) TARGET_LINK_LIBRARIES ( liblua_static ${LIBS}) @@ -61,7 +61,7 @@ TARGET_LINK_LIBRARIES ( lua liblua ) TARGET_LINK_LIBRARIES ( luac liblua_static ) # Install -INSTALL ( TARGETS lua luac liblua RUNTIME DESTINATION ${INSTALL_BIN} LIBRARY DESTINATION ${INSTALL_LIB} ) +INSTALL ( TARGETS lua luac liblua RUNTIME DESTINATION ${INSTALL_BIN} LIBRARY DESTINATION ${INSTALL_LIB} ARCHIVE DESTINATION ${INSTALL_LIB}) INSTALL ( FILES src/lua.h src/luaconf.h src/lualib.h src/lauxlib.h etc/lua.hpp DESTINATION ${INSTALL_INC} ) INSTALL ( FILES etc/strict.lua DESTINATION ${INSTALL_LMOD} ) INSTALL ( DIRECTORY doc etc test DESTINATION ${INSTALL_DATA} PATTERN ".git" EXCLUDE ) -- cgit v1.2.1