From: John L. <jr...@us...> - 2011-11-10 14:01:17
|
Update of /cvsroot/wxlua/wxLua/modules In directory vz-cvs-4.sog:/tmp/cvs-serv28069/modules Modified Files: CMakeLists.txt Log Message: CMake linux fixes Index: CMakeLists.txt =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/CMakeLists.txt,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** CMakeLists.txt 6 Nov 2011 05:12:14 -0000 1.6 --- CMakeLists.txt 10 Nov 2011 14:01:15 -0000 1.7 *************** *** 295,306 **** CACHE INTERNAL "") - else() - - set(wxLuaBind_ALL_LIBS wxLuaBindLib CACHE INTERNAL "") - - endif (wxLuaBind_SEPARATE_LIBS) - - # --------------------------------------------------------------------------- - set(wxLuaBindLib_SOURCES ${wxLuaBind_adv_Lib_SOURCE_FILES} --- 295,298 ---- *************** *** 334,337 **** --- 326,336 ---- set_source_files_properties(${wxLuaBindLib_OBJECTS} PROPERTIES GENERATED TRUE) + else() + + set(wxLuaBind_ALL_LIBS wxLuaBindLib CACHE INTERNAL "") + + endif (wxLuaBind_SEPARATE_LIBS) + + # --------------------------------------------------------------------------- ADD_LIBRARY_FULL( wxLuaBindLib ALLOW_MISSING_FILES *************** *** 470,474 **** function (wxLua_Modules_Lua_TARGETS) ! add_definitions( -D_CRT_SECURE_NO_WARNINGS ) ADD_LIBRARY_FULL( LuaLib --- 469,490 ---- function (wxLua_Modules_Lua_TARGETS) ! if (MSVC) ! set( LUA_BUILD_AS_DLL PROPERTIES DEFINE_SYMBOL LUA_BUILD_AS_DLL ) ! ! add_definitions( -D_CRT_SECURE_NO_WARNINGS ) ! else () ! ! set( LUA_BUILD_AS_DLL ) ! add_definitions( -DLUA_USE_LINUX ) ! ! set(LUA_LINK_LIBRARIES m dl readline history ncurses) ! ! ! #$(MAKE) all MYCFLAGS="" MYLIBS="-fPIC -Wl,-E -ldl -lreadline -lhistory -lncurses" ! endif() ! ! ! ! ADD_LIBRARY_FULL( LuaLib *************** *** 506,510 **** ${wxLua_ROOT_DIR}/modules/lua/src/linit.c LINK_LIBRARIES ! PROPERTIES DEFINE_SYMBOL "LUA_BUILD_AS_DLL" PROPERTIES FOLDER "wxLua/Modules") --- 522,526 ---- ${wxLua_ROOT_DIR}/modules/lua/src/linit.c LINK_LIBRARIES ! ${LUA_BUILD_AS_DLL} PROPERTIES FOLDER "wxLua/Modules") *************** *** 545,548 **** --- 561,565 ---- LINK_LIBRARIES LuaLib + ${LUA_LINK_LIBRARIES} PROPERTIES FOLDER "wxLua/apps") |