[Wxlua-commit] wxLua/modules CMakeLists.txt,1.7,1.8

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wxlua/wxLua/modules
In directory vz-cvs-4.sog:/tmp/cvs-serv26193/modules

Modified Files:
	CMakeLists.txt 
Log Message:
Fix CMake build for Linux, allow specifying what wx bindings to add. 

Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/CMakeLists.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CMakeLists.txt	10 Nov 2011 14:01:15 -0000	1.7
--- CMakeLists.txt	12 Nov 2011 05:44:48 -0000	1.8
***************
*** 26,32 ****
  function (wxLua_Modules_wxBind_TARGETS)

  if (wxLuaBind_SEPARATE_LIBS)

! if (WX_adv OR WX_advd OR WX_mono OR WX_monod)

  ADD_LIBRARY_FULL( wxLuaBind_adv_Lib
--- 26,35 ----
  function (wxLua_Modules_wxBind_TARGETS)

+ 
+ 
+ 
  if (wxLuaBind_SEPARATE_LIBS)

! if (WXLUA_BINDTO_adv)

  ADD_LIBRARY_FULL( wxLuaBind_adv_Lib
***************
*** 45,53 ****
  else()
      set(wxLuaBind_adv_Lib_)
! endif (WX_adv OR WX_advd OR WX_mono OR WX_monod)

  # ---------------------------------------------------------------------------

! if (WX_aui OR WX_auid OR WX_mono OR WX_monod)

  ADD_LIBRARY_FULL( wxLuaBind_aui_Lib
--- 48,56 ----
  else()
      set(wxLuaBind_adv_Lib_)
! endif (WXLUA_BINDTO_adv)

  # ---------------------------------------------------------------------------

! if (WXLUA_BINDTO_aui)

  ADD_LIBRARY_FULL( wxLuaBind_aui_Lib
***************
*** 66,74 ****
  else()
      set(wxLuaBind_aui_Lib_)
! endif (WX_aui OR WX_auid OR WX_mono OR WX_monod)

  # ---------------------------------------------------------------------------

! if (WX_base OR WX_based OR WX_mono OR WX_monod)

  ADD_LIBRARY_FULL( wxLuaBind_base_Lib
--- 69,77 ----
  else()
      set(wxLuaBind_aui_Lib_)
! endif (WXLUA_BINDTO_aui)

  # ---------------------------------------------------------------------------

! if (WXLUA_BINDTO_base)

  ADD_LIBRARY_FULL( wxLuaBind_base_Lib
***************
*** 86,94 ****
  else()
      set(wxLuaBind_base_Lib_)
! endif (WX_base OR WX_based OR WX_mono OR WX_monod)

  # ---------------------------------------------------------------------------

! if (WX_core OR WX_cored OR WX_mono OR WX_monod)

  ADD_LIBRARY_FULL( wxLuaBind_core_Lib
--- 89,97 ----
  else()
      set(wxLuaBind_base_Lib_)
! endif (WXLUA_BINDTO_base)

  # ---------------------------------------------------------------------------

! if (WXLUA_BINDTO_core)

  ADD_LIBRARY_FULL( wxLuaBind_core_Lib
***************
*** 107,115 ****
  else()
      set(wxLuaBind_core_Lib_)
! endif (WX_core OR WX_cored OR WX_mono OR WX_monod)

  # ---------------------------------------------------------------------------

! if (WX_gl OR WX_gld OR WX_mono OR WX_monod)

  ADD_LIBRARY_FULL( wxLuaBind_gl_Lib
--- 110,118 ----
  else()
      set(wxLuaBind_core_Lib_)
! endif (WXLUA_BINDTO_core)

  # ---------------------------------------------------------------------------

! if (WXLUA_BINDTO_gl)

  ADD_LIBRARY_FULL( wxLuaBind_gl_Lib
***************
*** 128,136 ****
  else()
      set(wxLuaBind_gl_Lib_)
! endif (WX_gl OR WX_gld OR WX_mono OR WX_monod)

  # ---------------------------------------------------------------------------

! if (WX_html OR WX_htmld OR WX_mono OR WX_monod)

  ADD_LIBRARY_FULL( wxLuaBind_html_Lib
--- 131,139 ----
  else()
      set(wxLuaBind_gl_Lib_)
! endif (WXLUA_BINDTO_gl)

  # ---------------------------------------------------------------------------

! if (WXLUA_BINDTO_html)

  ADD_LIBRARY_FULL( wxLuaBind_html_Lib
***************
*** 149,157 ****
  else()
      set(wxLuaBind_html_Lib_)
! endif (WX_html OR WX_htmld OR WX_mono OR WX_monod)

  # ---------------------------------------------------------------------------

! if (WX_media OR WX_mediad OR WX_mono OR WX_monod)

  ADD_LIBRARY_FULL( wxLuaBind_media_Lib
--- 152,160 ----
  else()
      set(wxLuaBind_html_Lib_)
! endif (WXLUA_BINDTO_html)

  # ---------------------------------------------------------------------------

! if (WXLUA_BINDTO_media)

  ADD_LIBRARY_FULL( wxLuaBind_media_Lib
***************
*** 171,179 ****
  else()
      set(wxLuaBind_media_Lib_)
! endif (WX_media OR WX_mediad OR WX_mono OR WX_monod)

  # ---------------------------------------------------------------------------

! if (WX_net OR WX_netd OR WX_mono OR WX_monod)

  ADD_LIBRARY_FULL( wxLuaBind_net_Lib
--- 174,182 ----
  else()
      set(wxLuaBind_media_Lib_)
! endif (WXLUA_BINDTO_media)

  # ---------------------------------------------------------------------------

! if (WXLUA_BINDTO_net)

  ADD_LIBRARY_FULL( wxLuaBind_net_Lib
***************
*** 192,200 ****
  else()
      set(wxLuaBind_net_Lib_)
! endif (WX_net OR WX_netd OR WX_mono OR WX_monod)

  # ---------------------------------------------------------------------------

! if (WX_richtext OR WX_richtextd OR WX_mono OR WX_monod)

  ADD_LIBRARY_FULL( wxLuaBind_richtext_Lib
--- 195,203 ----
  else()
      set(wxLuaBind_net_Lib_)
! endif (WXLUA_BINDTO_net)

  # ---------------------------------------------------------------------------

! if (WXLUA_BINDTO_richtext)

  ADD_LIBRARY_FULL( wxLuaBind_richtext_Lib
***************
*** 213,221 ****
  else()
      set(wxLuaBind_richtext_Lib_)
! endif (WX_richtext OR WX_richtextd OR WX_mono OR WX_monod)

  # ---------------------------------------------------------------------------

! if (WX_stc OR WX_stcd OR WX_mono OR WX_monod)

  ADD_LIBRARY_FULL( wxLuaBind_stc_Lib
--- 216,224 ----
  else()
      set(wxLuaBind_richtext_Lib_)
! endif (WXLUA_BINDTO_richtext)

  # ---------------------------------------------------------------------------

! if (WXLUA_BINDTO_stc)

  ADD_LIBRARY_FULL( wxLuaBind_stc_Lib
***************
*** 234,242 ****
  else()
      set(wxLuaBind_stc_Lib_)
! endif (WX_stc OR WX_stcd OR WX_mono OR WX_monod)

  # ---------------------------------------------------------------------------

! if (WX_xml OR WX_xmld OR WX_mono OR WX_monod)

  ADD_LIBRARY_FULL( wxLuaBind_xml_Lib
--- 237,245 ----
  else()
      set(wxLuaBind_stc_Lib_)
! endif (WXLUA_BINDTO_stc)

  # ---------------------------------------------------------------------------

! if (WXLUA_BINDTO_xml)

  ADD_LIBRARY_FULL( wxLuaBind_xml_Lib
***************
*** 255,263 ****
  else()
      set(wxLuaBind_xml_Lib_)
! endif (WX_xml OR WX_xmld OR WX_mono OR WX_monod)

  # ---------------------------------------------------------------------------

! if (WX_xrc OR WX_xrcd OR WX_mono OR WX_monod)

  ADD_LIBRARY_FULL( wxLuaBind_xrc_Lib
--- 258,266 ----
  else()
      set(wxLuaBind_xml_Lib_)
! endif (WXLUA_BINDTO_xml)

  # ---------------------------------------------------------------------------

! if (WXLUA_BINDTO_xrc)

  ADD_LIBRARY_FULL( wxLuaBind_xrc_Lib
***************
*** 276,280 ****
  else()
      set(wxLuaBind_xrc_Lib_)
! endif (WX_xrc OR WX_xrcd OR WX_mono OR WX_monod)

  # ---------------------------------------------------------------------------
--- 279,283 ----
  else()
      set(wxLuaBind_xrc_Lib_)
! endif (WXLUA_BINDTO_xrc)

  # ---------------------------------------------------------------------------
***************
*** 338,343 ****
          ${wxLua_ROOT_DIR}/modules/wxbind/include/*.h
      SOURCES
!         ${wxLua_ROOT_DIR}/modules/wxbind/src/*.cpp
!         #${wxLuaBindLib_SOURCES}
          #${wxLuaBindLib_OBJECTS}
      LINK_LIBRARIES
--- 341,346 ----
          ${wxLua_ROOT_DIR}/modules/wxbind/include/*.h
      SOURCES
!         #${wxLua_ROOT_DIR}/modules/wxbind/src/*.cpp
!         ${wxLuaBindLib_SOURCES}
          #${wxLuaBindLib_OBJECTS}
      LINK_LIBRARIES
***************
*** 442,448 ****
  ADD_LIBRARY_FULL( wxLuaModule SHARED ALLOW_MISSING_FILES
      HEADERS
!         ${wxLua_ROOT_DIR}/modules/luamodule/include/*.h
      SOURCES
!         ${wxLua_ROOT_DIR}/modules/luamodule/src/*.cpp
          ${wxLuaBindLib_SOURCE_FILES}
          ${wxLuaSocketLib_SOURCE_FILES}
--- 445,451 ----
  ADD_LIBRARY_FULL( wxLuaModule SHARED ALLOW_MISSING_FILES
      HEADERS
!         ${wxLua_ROOT_DIR}/modules/luamodule/include/luamoduledefs.h
      SOURCES
!         ${wxLua_ROOT_DIR}/modules/luamodule/src/luamodule.cpp
          ${wxLuaBindLib_SOURCE_FILES}
          ${wxLuaSocketLib_SOURCE_FILES}
***************
*** 480,529 ****
      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
      HEADERS
!         ${wxLua_ROOT_DIR}/modules/lua/src/*.h
      SOURCES
!         ${wxLua_ROOT_DIR}/modules/lua/src/lapi.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/lcode.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/ldebug.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/ldo.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/ldump.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/lfunc.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/lgc.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/llex.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/lmem.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/lobject.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/lopcodes.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/lparser.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/lstate.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/lstring.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/ltable.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/ltm.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/lundump.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/lvm.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/lzio.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/lauxlib.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/lbaselib.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/ldblib.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/liolib.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/lmathlib.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/loslib.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/ltablib.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/lstrlib.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/loadlib.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/linit.c
      LINK_LIBRARIES
      ${LUA_BUILD_AS_DLL}
      PROPERTIES FOLDER "wxLua/Modules")

- 
  if (MSVC60)
      # Some sort of bug linking to the object files in MSVC6
--- 483,527 ----
      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
      HEADERS
!         src/*.h
      SOURCES
!         src/lapi.c
!         src/lcode.c
!         src/ldebug.c
!         src/ldo.c
!         src/ldump.c
!         src/lfunc.c
!         src/lgc.c
!         src/llex.c
!         src/lmem.c
!         src/lobject.c
!         src/lopcodes.c
!         src/lparser.c
!         src/lstate.c
!         src/lstring.c
!         src/ltable.c
!         src/ltm.c
!         src/lundump.c
!         src/lvm.c
!         src/lzio.c
!         src/lauxlib.c
!         src/lbaselib.c
!         src/ldblib.c
!         src/liolib.c
!         src/lmathlib.c
!         src/loslib.c
!         src/ltablib.c
!         src/lstrlib.c
!         src/loadlib.c
!         src/linit.c
      LINK_LIBRARIES
      ${LUA_BUILD_AS_DLL}
      PROPERTIES FOLDER "wxLua/Modules")

  if (MSVC60)
      # Some sort of bug linking to the object files in MSVC6
***************
*** 539,548 ****
  endif()

- 
  ADD_EXECUTABLE_FULL( luac ALLOW_MISSING_FILES
      HEADERS ""
      SOURCES
!         ${wxLua_ROOT_DIR}/modules/lua/src/luac.c
!         ${wxLua_ROOT_DIR}/modules/lua/src/print.c
          #${LuaLib_SOURCE_FILES} # alternatively we could simply recompile these
          #${LuaLib_OBJECTS}      # see note above about DLL linking
--- 537,545 ----
  endif()

  ADD_EXECUTABLE_FULL( luac ALLOW_MISSING_FILES
      HEADERS ""
      SOURCES
!         src/luac.c
!         src/print.c
          #${LuaLib_SOURCE_FILES} # alternatively we could simply recompile these
          #${LuaLib_OBJECTS}      # see note above about DLL linking
***************
*** 550,553 ****
--- 547,551 ----
      LINK_LIBRARIES
          # LuaLib                # see note above about DLL linking
+         ${LUA_LINK_LIBRARIES}
      PROPERTIES FOLDER "wxLua/apps")

***************
*** 558,562 ****
      HEADERS
      SOURCES
!         ${wxLua_ROOT_DIR}/modules/lua/src/lua.c
      LINK_LIBRARIES
          LuaLib
--- 556,560 ----
      HEADERS
      SOURCES
!         src/lua.c
      LINK_LIBRARIES
          LuaLib