Merge branch 'build_cmake' of https://github.com/TcT2k/wxWidgets
Add CMake-based build system. Merge the original branch without any changes except for resolving the conflict due to moving the contents of .travis.yml to a separate file by propagating the changes done in this file since then to the new script and rerunning ./build/update-setup-h and ./build/cmake/update_files.py to update the file lists changed in the meanwhile. Closes https://github.com/wxWidgets/wxWidgets/pull/330
This commit is contained in:
@@ -39,6 +39,11 @@ cat_common_options_for()
|
||||
cmd="$cmd | sed -e '/^\/\//d' \
|
||||
-e 's@ *//.*\$@@' \
|
||||
-e 's/# *define \(.\+\) \+1 *\$/#define \1 0/'"
|
||||
elif [ $2 = "build/cmake/setup.h.in" ]; then
|
||||
# The setup.h.in template for cmake needs special processing
|
||||
cmd="$cmd | sed -e '/^\/\//d' \
|
||||
-e 's@ *//.*\$@@' \
|
||||
-e 's/# *define \(.\+\) \+\(1\|0\) *\$/#cmakedefine01 \1/'"
|
||||
fi
|
||||
|
||||
eval $cmd
|
||||
@@ -103,10 +108,12 @@ update_common_setup_h include/wx/gtk/setup0.h
|
||||
update_common_setup_h include/wx/osx/setup0.h
|
||||
update_common_setup_h include/wx/univ/setup0.h
|
||||
update_common_setup_h setup.h.in
|
||||
update_common_setup_h build/cmake/setup.h.in
|
||||
|
||||
update_msw_setup_h include/wx/msw/setup0.h
|
||||
update_msw_setup_h include/wx/gtk/setup0.h
|
||||
update_msw_setup_h setup.h.in
|
||||
update_msw_setup_h build/cmake/setup.h.in
|
||||
|
||||
update_osx_setup_h include/wx/osx/setup0.h
|
||||
update_msw_setup_h setup.h.in
|
||||
|
Reference in New Issue
Block a user