Mercurial > luasocket
diff CMakeLists.txt @ 1:cf0892e34f45
Resyncing with Git repo
| author | Eric Wing <ewing . public |-at-| gmail . com> |
|---|---|
| date | Wed, 27 Aug 2008 22:44:22 -0700 |
| parents | 4b915342e2a8 |
| children | 9d9266316a91 |
line wrap: on
line diff
--- a/CMakeLists.txt Tue Aug 26 18:40:01 2008 -0700 +++ b/CMakeLists.txt Wed Aug 27 22:44:22 2008 -0700 @@ -1,13 +1,14 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) + PROJECT(LuaSocket) IF(USING_LUA_MULTI_SET) IF(NOT LUA_LIBRARIES) - IF(lua_library_dynamic) - SET(LUA_LIBRARIES lua_library_dynamic) - ELSE(lua_library_dynamic) + IF(lua_library_module) + SET(LUA_LIBRARIES lua_library_module) + ELSE(lua_library_module) SET(LUA_LIBRARIES lua_library_static) - ENDIF(lua_library_dynamic) + ENDIF(lua_library_module) ENDIF(NOT LUA_LIBRARIES) IF(NOT LUA_INCLUDE_DIR) SET(LUA_INCLUDE_DIR ${Lua_SOURCE_DIR}/src) @@ -18,7 +19,6 @@ OPTION(WANTS_BUILD_SHARED_LIBRARY "Set to ON to build dynamic library." ON) #OPTION(WANTS_BUILD_STATIC_LIBRARY "Set to ON to build static library." ON) -OPTION(WANTS_BUILD_FRAMEWORK "Set to ON to build framework instead of dylib. Only valid if BUILD_SHARED_LIBRARY is ON an is OS X." ON) SET(LUAPACKAGE_CDIR "lib/lua/5.1" CACHE STRING "Path for Lua packaged platform specific things.") SET(LUAPACKAGE_LDIR "share/lua/5.1" CACHE STRING "Path for Lua packages platform independent things.") @@ -37,7 +37,7 @@ #IF(WANTS_BUILD_SHARED_LIBRARY AND WANTS_BUILD_FRAMEWORK) -# SET_TARGET_PROPERTIES(luasocket_library_dynamic PROPERTIES +# SET_TARGET_PROPERTIES(luasocket_library_module PROPERTIES # FRAMEWORK TRUE # # FRAMEWORK_VERSION 5.1 # # PRIVATE_HEADER "fooPrivate.h;fooBoth.h" @@ -48,7 +48,7 @@ # ) #ENDIF(WANTS_BUILD_SHARED_LIBRARY AND WANTS_BUILD_FRAMEWORK) -#SET_TARGET_PROPERTIES(luasocket_library_dynamic PROPERTIES +#SET_TARGET_PROPERTIES(luasocket_library_module PROPERTIES # PUBLIC_HEADER "${luasocket_PUBLIC_HEADERS}" # RESOURCE "${luasocket_RESOURCE_FILES}" #)