Merge pull request #811 from MaartenBent/cmake-and-more

CMake and sample improvements: notably, allow more samples to find their
files.

build/cmake/init.cmake

@@ -59,7 +59,7 @@ if(WIN32)
         message(FATAL_ERROR "Unknown WIN32 compiler type")
     endif()
 
-    if(CMAKE_CL_64)
+    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
         set(wxARCH_SUFFIX "_x64")
     endif()
 else()
@@ -109,7 +109,7 @@ else()
 endif()
 set(wxSETUP_HEADER_FILE ${wxSETUP_HEADER_PATH}/wx/setup.h)
 
-if(NOT wxBUILD_CUSTOM_SETUP_HEADER_PATH AND MSVC)
+if(DEFINED wxSETUP_HEADER_FILE_DEBUG)
     # Append configuration specific suffix to setup header path
     wx_string_append(wxSETUP_HEADER_PATH "$<$<CONFIG:Debug>:d>")
 endif()

build/cmake/main.cmake

@@ -53,7 +53,7 @@ if(MSVC OR MINGW OR CYGWIN)
     else()
         set(wxREQUIRED_OS_DESC "Windows Vista / Windows Server 2008")
     endif()
-    if(CMAKE_CL_64)
+    if(CMAKE_SIZEOF_VOID_P EQUAL 8)
         wx_string_append(wxREQUIRED_OS_DESC " (x64 Edition)")
     endif()
 elseif(APPLE AND NOT IPHONE)

build/cmake/samples/CMakeLists.txt

@@ -189,7 +189,20 @@ if(APPLE)
     # elsewhere we just compile native.cpp directly.
     list(APPEND SAMPLE_WIDGETS_SRC native_wrapper.mm)
 endif()
-wx_add_sample(widgets IMPORTANT ${SAMPLE_WIDGETS_SRC} LIBRARIES adv)
+wx_list_add_prefix(WIDGETS_RC_FILES icons/
+    activityindicator.xpm bmpbtn.xpm bmpcombobox.xpm button.xpm
+    checkbox.xpm choice.xpm choicebk.xpm clrpicker.xpm
+    combobox.xpm datepick.xpm dirctrl.xpm dirpicker.xpm
+    filepicker.xpm fontpicker.xpm gauge.xpm header.xpm
+    hyperlnk.xpm listbook.xpm listbox.xpm native.xpm
+    notebook.xpm odcombobox.xpm radiobox.xpm scrolbar.xpm
+    slider.xpm spinbtn.xpm statbmp.xpm statbox.xpm
+    stattext.xpm text.xpm timepick.xpm toggle.xpm
+    )
+wx_add_sample(widgets IMPORTANT ${SAMPLE_WIDGETS_SRC} 
+    DATA ${WIDGETS_RC_FILES} textctrl.cpp
+    LIBRARIES adv
+    )
 wx_add_sample(wizard LIBRARIES adv DEPENDS wxUSE_WIZARDDLG)
 wx_add_sample(wrapsizer)