Menu
▾
▴
[Wxlua-commit] wxLua/modules CMakeLists.txt,1.4,1.5
|
From: John L. <jr...@us...> - 2011-11-03 04:23:21
|
Update of /cvsroot/wxlua/wxLua/modules
In directory vz-cvs-4.sog:/tmp/cvs-serv32273/modules
Modified Files:
CMakeLists.txt
Log Message:
Allow switching between building monolithic wxbind lib or separate ones in CMake.
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/CMakeLists.txt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CMakeLists.txt 2 Nov 2011 04:18:10 -0000 1.4
--- CMakeLists.txt 3 Nov 2011 04:23:19 -0000 1.5
***************
*** 20,83 ****
${wxLua_ROOT_DIR}/modules/lua/src)
! # ---------------------------------------------------------------------------
!
! ADD_LIBRARY_FULL( wxLuaLib
! HEADERS
! ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlbind.h
! ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlcallb.h
! ${wxLua_ROOT_DIR}/modules/wxlua/include/wxldefs.h
! ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlstate.h
! ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlua.h
! ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlua_bind.h
! SOURCES
! ${wxLua_ROOT_DIR}/modules/wxlua/src/dummy.cpp
! ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlbind.cpp
! ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlcallb.cpp
! ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlstate.cpp
! ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlua_bind.cpp
! LINK_LIBRARIES
! LuaLib
! ${wxWidgets_LIBRARIES}
! PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUA"
! PROPERTIES FOLDER "wxLua/Modules")
!
! # ---------------------------------------------------------------------------
!
! ADD_LIBRARY_FULL( wxLuaDebugLib
! HEADERS
! ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxldebug.h
! ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxlstack.h
! ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxluadebugdefs.h
! SOURCES
! ${wxLua_ROOT_DIR}/modules/wxluadebug/src/dummy.cpp
! ${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxldebug.cpp
! ${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxlstack.cpp
! LINK_LIBRARIES
! wxLuaLib
! PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUADEBUG"
! PROPERTIES FOLDER "wxLua/Modules")
!
! # ---------------------------------------------------------------------------
!
! ADD_LIBRARY_FULL( wxLuaSocketLib
! HEADERS
! ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxldserv.h
! ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxldtarg.h
! ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxlsock.h
! ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxluasocket_bind.h
! ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxluasocketdefs.h
! SOURCES
! ${wxLua_ROOT_DIR}/modules/wxluasocket/src/dummy.cpp
! ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxldserv.cpp
! ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxldtarg.cpp
! ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxlsock.cpp
! ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxluasocket_bind.cpp
! LINK_LIBRARIES
! wxLuaBind_core_Lib
! wxLuaDebugLib
! PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUASOCKET"
! PROPERTIES FOLDER "wxLua/Modules")
!
! # ---------------------------------------------------------------------------
if (WX_adv OR WX_advd OR WX_mono OR WX_monod)
--- 20,24 ----
${wxLua_ROOT_DIR}/modules/lua/src)
! # ===========================================================================
if (WX_adv OR WX_advd OR WX_mono OR WX_monod)
***************
*** 95,100 ****
--- 36,46 ----
PROPERTIES FOLDER "wxLua/Modules")
+ set(wxLuaBind_adv_Lib_ wxLuaBind_adv_Lib)
+ 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)
***************
*** 111,116 ****
--- 57,67 ----
PROPERTIES FOLDER "wxLua/Modules")
+ set(wxLuaBind_aui_Lib_ wxLuaBind_aui_Lib)
+ 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)
***************
*** 126,131 ****
--- 77,87 ----
PROPERTIES FOLDER "wxLua/Modules")
+ set(wxLuaBind_base_Lib_ wxLuaBind_base_Lib)
+ 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)
***************
*** 142,147 ****
--- 98,108 ----
PROPERTIES FOLDER "wxLua/Modules")
+ set(wxLuaBind_core_Lib_ wxLuaBind_core_Lib)
+ 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)
***************
*** 158,163 ****
--- 119,129 ----
PROPERTIES FOLDER "wxLua/Modules")
+ set(wxLuaBind_gl_Lib_ wxLuaBind_gl_Lib)
+ 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)
***************
*** 174,179 ****
--- 140,150 ----
PROPERTIES FOLDER "wxLua/Modules")
+ set(wxLuaBind_html_Lib_ wxLuaBind_html_Lib)
+ 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)
***************
*** 191,196 ****
--- 162,172 ----
PROPERTIES FOLDER "wxLua/Modules")
+ set(wxLuaBind_media_Lib_ wxLuaBind_media_Lib)
+ 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)
***************
*** 207,212 ****
--- 183,193 ----
PROPERTIES FOLDER "wxLua/Modules")
+ set(wxLuaBind_net_Lib_ wxLuaBind_net_Lib)
+ 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)
***************
*** 223,228 ****
--- 204,214 ----
PROPERTIES FOLDER "wxLua/Modules")
+ set(wxLuaBind_richtext_Lib_ wxLuaBind_richtext_Lib)
+ 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)
***************
*** 239,244 ****
--- 225,235 ----
PROPERTIES FOLDER "wxLua/Modules")
+ set(wxLuaBind_stc_Lib_ wxLuaBind_stc_Lib)
+ 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)
***************
*** 255,260 ****
--- 246,256 ----
PROPERTIES FOLDER "wxLua/Modules")
+ set(wxLuaBind_xml_Lib_ wxLuaBind_xml_Lib)
+ 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)
***************
*** 271,306 ****
PROPERTIES FOLDER "wxLua/Modules")
endif (WX_xrc OR WX_xrcd OR WX_mono OR WX_monod)
# ---------------------------------------------------------------------------
set(wxLuaBindLib_SOURCES
! ${wxLuaBind_adv_Lib_SOURCE_FILES}
! ${wxLuaBind_aui_Lib_SOURCE_FILES}
! ${wxLuaBind_base_Lib_SOURCE_FILES}
! ${wxLuaBind_core_Lib_SOURCE_FILES}
! ${wxLuaBind_gl_Lib_SOURCE_FILES}
! ${wxLuaBind_html_Lib_SOURCE_FILES}
! ${wxLuaBind_media_Lib_SOURCE_FILES}
! ${wxLuaBind_net_Lib_SOURCE_FILES}
! ${wxLuaBind_richtext_Lib_SOURCE_FILES}
! ${wxLuaBind_stc_Lib_SOURCE_FILES}
! ${wxLuaBind_xml_Lib_SOURCE_FILES}
! ${wxLuaBind_xrc_Lib_SOURCE_FILES})
list(REMOVE_DUPLICATES wxLuaBindLib_SOURCES)
set(wxLuaBindLib_OBJECTS
! ${wxLuaBind_adv_Lib_OBJECT_FILES}
! ${wxLuaBind_aui_Lib_OBJECT_FILES}
! ${wxLuaBind_base_Lib_OBJECT_FILES}
! ${wxLuaBind_core_Lib_OBJECT_FILES}
! ${wxLuaBind_gl_Lib_OBJECT_FILES}
! ${wxLuaBind_html_Lib_OBJECT_FILES}
! ${wxLuaBind_media_Lib_OBJECT_FILES}
! ${wxLuaBind_net_Lib_OBJECT_FILES}
! ${wxLuaBind_richtext_Lib_OBJECT_FILES}
! ${wxLuaBind_stc_Lib_OBJECT_FILES}
! ${wxLuaBind_xml_Lib_OBJECT_FILES}
! ${wxLuaBind_xrc_Lib_OBJECT_FILES})
list(REMOVE_DUPLICATES wxLuaBindLib_OBJECTS)
set_source_files_properties(${wxLuaBindLib_OBJECTS} PROPERTIES GENERATED TRUE)
--- 267,323 ----
PROPERTIES FOLDER "wxLua/Modules")
+ set(wxLuaBind_xrc_Lib_ wxLuaBind_xrc_Lib)
+ else()
+ set(wxLuaBind_xrc_Lib_)
endif (WX_xrc OR WX_xrcd OR WX_mono OR WX_monod)
# ---------------------------------------------------------------------------
+ set(wxLuaBind_ALL_LIBS
+ ${wxLuaBind_adv_Lib_}
+ ${wxLuaBind_aui_Lib_}
+ ${wxLuaBind_base_Lib_}
+ ${wxLuaBind_core_Lib_}
+ ${wxLuaBind_gl_Lib_}
+ ${wxLuaBind_html_Lib_}
+ ${wxLuaBind_media_Lib_}
+ ${wxLuaBind_net_Lib_}
+ ${wxLuaBind_richtext_Lib_}
+ ${wxLuaBind_stc_Lib_}
+ ${wxLuaBind_xml_Lib_}
+ ${wxLuaBind_xrc_Lib_})
+
+ set(wxLuaBind_ALL_LIBS wxLuaBindLib)
+
+ # ---------------------------------------------------------------------------
+
set(wxLuaBindLib_SOURCES
! ${wxLuaBind_adv_Lib_SOURCE_FILES}
! ${wxLuaBind_aui_Lib_SOURCE_FILES}
! ${wxLuaBind_base_Lib_SOURCE_FILES}
! ${wxLuaBind_core_Lib_SOURCE_FILES}
! ${wxLuaBind_gl_Lib_SOURCE_FILES}
! ${wxLuaBind_html_Lib_SOURCE_FILES}
! ${wxLuaBind_media_Lib_SOURCE_FILES}
! ${wxLuaBind_net_Lib_SOURCE_FILES}
! ${wxLuaBind_richtext_Lib_SOURCE_FILES}
! ${wxLuaBind_stc_Lib_SOURCE_FILES}
! ${wxLuaBind_xml_Lib_SOURCE_FILES}
! ${wxLuaBind_xrc_Lib_SOURCE_FILES})
list(REMOVE_DUPLICATES wxLuaBindLib_SOURCES)
set(wxLuaBindLib_OBJECTS
! ${wxLuaBind_adv_Lib_OBJECT_FILES}
! ${wxLuaBind_aui_Lib_OBJECT_FILES}
! ${wxLuaBind_base_Lib_OBJECT_FILES}
! ${wxLuaBind_core_Lib_OBJECT_FILES}
! ${wxLuaBind_gl_Lib_OBJECT_FILES}
! ${wxLuaBind_html_Lib_OBJECT_FILES}
! ${wxLuaBind_media_Lib_OBJECT_FILES}
! ${wxLuaBind_net_Lib_OBJECT_FILES}
! ${wxLuaBind_richtext_Lib_OBJECT_FILES}
! ${wxLuaBind_stc_Lib_OBJECT_FILES}
! ${wxLuaBind_xml_Lib_OBJECT_FILES}
! ${wxLuaBind_xrc_Lib_OBJECT_FILES})
list(REMOVE_DUPLICATES wxLuaBindLib_OBJECTS)
set_source_files_properties(${wxLuaBindLib_OBJECTS} PROPERTIES GENERATED TRUE)
***************
*** 317,321 ****
wxLuaLib
PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXBIND"
! PROPERTIES LINKER_LANGUAGE CXX
PROPERTIES FOLDER "wxLua/Modules")
--- 334,338 ----
wxLuaLib
PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXBIND"
! #PROPERTIES LINKER_LANGUAGE CXX
PROPERTIES FOLDER "wxLua/Modules")
***************
*** 335,340 ****
--- 352,417 ----
# wxLuaBind_xrc_Lib)
+ # ===========================================================================
+
+ ADD_LIBRARY_FULL( wxLuaLib
+ HEADERS
+ ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlbind.h
+ ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlcallb.h
+ ${wxLua_ROOT_DIR}/modules/wxlua/include/wxldefs.h
+ ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlstate.h
+ ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlua.h
+ ${wxLua_ROOT_DIR}/modules/wxlua/include/wxlua_bind.h
+ SOURCES
+ ${wxLua_ROOT_DIR}/modules/wxlua/src/dummy.cpp
+ ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlbind.cpp
+ ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlcallb.cpp
+ ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlstate.cpp
+ ${wxLua_ROOT_DIR}/modules/wxlua/src/wxlua_bind.cpp
+ LINK_LIBRARIES
+ LuaLib
+ ${wxWidgets_LIBRARIES}
+ PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUA"
+ PROPERTIES FOLDER "wxLua/Modules")
+
+ # ---------------------------------------------------------------------------
+
+ ADD_LIBRARY_FULL( wxLuaDebugLib
+ HEADERS
+ ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxldebug.h
+ ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxlstack.h
+ ${wxLua_ROOT_DIR}/modules/wxluadebug/include/wxluadebugdefs.h
+ SOURCES
+ ${wxLua_ROOT_DIR}/modules/wxluadebug/src/dummy.cpp
+ ${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxldebug.cpp
+ ${wxLua_ROOT_DIR}/modules/wxluadebug/src/wxlstack.cpp
+ LINK_LIBRARIES
+ wxLuaLib
+ PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUADEBUG"
+ PROPERTIES FOLDER "wxLua/Modules")
+
# ---------------------------------------------------------------------------
+ ADD_LIBRARY_FULL( wxLuaSocketLib
+ HEADERS
+ ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxldserv.h
+ ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxldtarg.h
+ ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxlsock.h
+ ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxluasocket_bind.h
+ ${wxLua_ROOT_DIR}/modules/wxluasocket/include/wxluasocketdefs.h
+ SOURCES
+ ${wxLua_ROOT_DIR}/modules/wxluasocket/src/dummy.cpp
+ ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxldserv.cpp
+ ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxldtarg.cpp
+ ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxlsock.cpp
+ ${wxLua_ROOT_DIR}/modules/wxluasocket/src/wxluasocket_bind.cpp
+ LINK_LIBRARIES
+ #wxLuaBind_core_Lib
+ ${wxLuaBind_ALL_LIBS} # Only need core for wxluatype_wxWindow
+ wxLuaDebugLib
+ PROPERTIES DEFINE_SYMBOL "WXMAKINGDLL_WXLUASOCKET"
+ PROPERTIES FOLDER "wxLua/Modules")
+
+ # ===========================================================================
+
ADD_LIBRARY_FULL( wxLuaModule SHARED ALLOW_MISSING_FILES
HEADERS
***************
*** 359,364 ****
PROPERTIES COMPILE_DEFINITIONS "WXMAKINGDLL_WXLUA;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXBIND")
!
! # ---------------------------------------------------------------------------
add_definitions( -D_CRT_SECURE_NO_WARNINGS )
--- 436,440 ----
PROPERTIES COMPILE_DEFINITIONS "WXMAKINGDLL_WXLUA;WXMAKINGDLL_WXLUASOCKET;WXMAKINGDLL_WXLUADEBUG;WXMAKINGDLL_WXBIND")
! # ===========================================================================
add_definitions( -D_CRT_SECURE_NO_WARNINGS )
|