From b147586bc330642d352446becb0df01a445e1239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Diego=20Mart=C3=ADnez?= Date: Wed, 9 Jan 2013 12:25:32 -0200 Subject: [PATCH] Removed LITE_VERSION option --- CMakeLists.txt | 194 +++++++++++++++++++++++-------------------------- 1 file changed, 91 insertions(+), 103 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 28a8388..b30bb4f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,118 +5,106 @@ cmake_minimum_required(VERSION 2.8) project(MINETEST_IRC C) -set(MINETEST_IRC_VERSION 0.1.2) - -option(LITE_VERSION "Do not build & package luasocket as part of the mod" OFF) +set(MINETEST_IRC_VERSION 0.1.0) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake") -if(NOT LITE_VERSION) +set(LUA_SRCS + src/lua/lapi.c + src/lua/lcode.c + src/lua/ldebug.c + src/lua/ldo.c + src/lua/ldump.c + src/lua/lfunc.c + src/lua/lgc.c + src/lua/llex.c + src/lua/lmem.c + src/lua/lobject.c + src/lua/lopcodes.c + src/lua/lparser.c + src/lua/lstate.c + src/lua/lstring.c + src/lua/ltable.c + src/lua/ltm.c + src/lua/lundump.c + src/lua/lvm.c + src/lua/lzio.c + src/lua/lauxlib.c + src/lua/lbaselib.c + src/lua/ldblib.c + src/lua/liolib.c + src/lua/lmathlib.c + src/lua/loslib.c + src/lua/ltablib.c + src/lua/lstrlib.c + src/lua/loadlib.c + src/lua/linit.c +) - set(LUA_SRCS - src/lua/lapi.c - src/lua/lcode.c - src/lua/ldebug.c - src/lua/ldo.c - src/lua/ldump.c - src/lua/lfunc.c - src/lua/lgc.c - src/lua/llex.c - src/lua/lmem.c - src/lua/lobject.c - src/lua/lopcodes.c - src/lua/lparser.c - src/lua/lstate.c - src/lua/lstring.c - src/lua/ltable.c - src/lua/ltm.c - src/lua/lundump.c - src/lua/lvm.c - src/lua/lzio.c - src/lua/lauxlib.c - src/lua/lbaselib.c - src/lua/ldblib.c - src/lua/liolib.c - src/lua/lmathlib.c - src/lua/loslib.c - src/lua/ltablib.c - src/lua/lstrlib.c - src/lua/loadlib.c - src/lua/linit.c - ) - - set(LUASOCKET_SRCS - src/luasocket/compat51.c - src/luasocket/luasocket.c - src/luasocket/timeout.c - src/luasocket/buffer.c - src/luasocket/io.c - src/luasocket/auxiliar.c - src/luasocket/options.c - src/luasocket/inet.c - src/luasocket/tcp.c - src/luasocket/udp.c - src/luasocket/except.c - src/luasocket/select.c - src/luasocket/buffer.c - src/luasocket/auxiliar.c - src/luasocket/options.c - src/luasocket/timeout.c - src/luasocket/io.c - src/luasocket/mime.c - ) - - if(WIN32) - list(APPEND LUASOCKET_SRCS src/luasocket/wsocket.c) - set(LUASOCKET_EXTRA_LIBS -lwininet) - else() - list(APPEND LUASOCKET_SRCS src/luasocket/usocket.c src/luasocket/unix.c) - endif() - - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/lua) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/luasocket) - - add_library(luasocket_lib MODULE ${LUASOCKET_SRCS} ${LUA_SRCS}) - +set(LUASOCKET_SRCS + src/luasocket/compat51.c + src/luasocket/luasocket.c + src/luasocket/timeout.c + src/luasocket/buffer.c + src/luasocket/io.c + src/luasocket/auxiliar.c + src/luasocket/options.c + src/luasocket/inet.c + src/luasocket/tcp.c + src/luasocket/udp.c + src/luasocket/except.c + src/luasocket/select.c + src/luasocket/buffer.c + src/luasocket/auxiliar.c + src/luasocket/options.c + src/luasocket/timeout.c + src/luasocket/io.c + src/luasocket/mime.c +) + +if(WIN32) + list(APPEND LUASOCKET_SRCS src/luasocket/wsocket.c) + set(LUASOCKET_EXTRA_LIBS -lwininet) +else() + list(APPEND LUASOCKET_SRCS src/luasocket/usocket.c src/luasocket/unix.c) +endif() + +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/lua) +include_directories(${CMAKE_CURRENT_SOURCE_DIR}/src/luasocket) + +add_library(luasocket_lib MODULE ${LUASOCKET_SRCS} ${LUA_SRCS}) + +set_target_properties(luasocket_lib PROPERTIES + OUTPUT_NAME luasocket) + +if(WIN32) + # When using MinGW32, CMake prefixes DLLs with "lib". Force remove + # this prefix regardless of compiler. set_target_properties(luasocket_lib PROPERTIES - OUTPUT_NAME luasocket) - - if(WIN32) - # When using MinGW32, CMake prefixes DLLs with "lib". Force remove - # this prefix regardless of compiler. + PREFIX "") + if (NOT MSVC) # GCC? + # The `-fPIC' flag generates a warning on MinGW32, which combined + # with `-Werror' makes that an error though `-fPIC' is ignored. + # We use `-fno-PIC' to avoid that. set_target_properties(luasocket_lib PROPERTIES - PREFIX "") - if (NOT MSVC) # GCC? - # The `-fPIC' flag generates a warning on MinGW32, which combined - # with `-Werror' makes that an error though `-fPIC' is ignored. - # We use `-fno-PIC' to avoid that. - set_target_properties(luasocket_lib PROPERTIES - COMPILE_FLAGS "-fno-PIC -Wall -Werror") - endif() - find_library(ws2_32_lib NAMES ws2_32) - target_link_libraries(luasocket_lib ${ws2_32_lib}) - else() # Possibly Unix - set_target_properties(luasocket_lib PROPERTIES - COMPILE_FLAGS "-Wall -Werror") + COMPILE_FLAGS "-fno-PIC -Wall -Werror") endif() - - if(WIN32) - set(lib "${CMAKE_CURRENT_BINARY_DIR}/luasocket.dll") - else() - set(lib "${CMAKE_CURRENT_BINARY_DIR}/libluasocket.so") - endif() - - set(inst_lib COMMAND ${CMAKE_COMMAND} -E copy ${lib} ${dir}) - -else(NOT LITE_VERSION) - - set(inst_lib) - -endif(NOT LITE_VERSION) + find_library(ws2_32_lib NAMES ws2_32) + target_link_libraries(luasocket_lib ${ws2_32_lib}) +else() # Possibly Unix + set_target_properties(luasocket_lib PROPERTIES + COMPILE_FLAGS "-Wall -Werror") +endif() set(dir ${CMAKE_CURRENT_BINARY_DIR}/irc/) +if(WIN32) + set(lib "${CMAKE_CURRENT_BINARY_DIR}/luasocket.dll") +else() + set(lib "${CMAKE_CURRENT_BINARY_DIR}/libluasocket.so") +endif() + add_custom_target(pack_mod WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} @@ -137,7 +125,7 @@ add_custom_target(pack_mod COMMAND ${CMAKE_COMMAND} -E copy src/luasocket/tp.lua ${dir} COMMAND ${CMAKE_COMMAND} -E copy src/luasocket/url.lua ${dir} COMMAND ${CMAKE_COMMAND} -E copy doc/LICENSE-luasocket.txt ${dir} - ${inst_lib} + COMMAND ${CMAKE_COMMAND} -E copy ${lib} ${dir} # IRC mod COMMAND ${CMAKE_COMMAND} -E make_directory ${dir}