Menu
▾
▴
plplot-cvs
|
From: <ai...@us...> - 2013-12-19 01:33:01
|
Revision: 12882
http://sourceforge.net/p/plplot/code/12882
Author: airwin
Date: 2013-12-19 01:32:58 +0000 (Thu, 19 Dec 2013)
Log Message:
-----------
Try some different toolkit options for the wxwidgets build, but
ultimately none of those worked on Linux except for the gtk
toolkit that is the default (because the other cannot handle
the required (by PLplot) unicode capability). So comment out the
toolkit options.
Modified Paths:
--------------
trunk/cmake/epa_build/wxwidgets/CMakeLists.txt
Modified: trunk/cmake/epa_build/wxwidgets/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/wxwidgets/CMakeLists.txt 2013-12-19 01:25:14 UTC (rev 12881)
+++ trunk/cmake/epa_build/wxwidgets/CMakeLists.txt 2013-12-19 01:32:58 UTC (rev 12882)
@@ -41,6 +41,18 @@
set(CXXFLAGS "-fno-keep-inline-dllexport $ENV{CXXFLAGS}")
else(MSYS_PLATFORM)
set(CXXFLAGS "$ENV{CXXFLAGS}")
+ # To avoid having to build all of gtk with epa_build in a consistent
+ # manner I tried several alternatives to the gtk toolkit.
+ # e.g.,
+ # set(toolkit_options --with-x11)
+ # set(toolkit_options --with-motif)
+ # But neither of those worked because they are not capable of
+ # supplying the unicode (see --enable-unicode below) capability
+ # that is provided by the default gtk toolkit and needed by the
+ # PLplot build of the wxwidgets device.
+ # The inevitable conclusion is that on Unix, we must use the gtk toolkit
+ # and therefore epa_build must provide a consistent version of that
+ # as a dependency of wxwidgets.
endif(MSYS_PLATFORM)
set(CFLAGS "$ENV{CFLAGS}")
@@ -57,7 +69,7 @@
build_${PACKAGE}
URL ${URL}
URL_MD5 ${URL_MD5}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-shared --enable-unicode --enable-debug --enable-debug_gdb
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-shared --enable-unicode --enable-debug --enable-debug_gdb ${toolkit_options}
BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-03-17 04:46:13
|
Revision: 13079
http://sourceforge.net/p/plplot/code/13079
Author: airwin
Date: 2014-03-17 04:46:07 +0000 (Mon, 17 Mar 2014)
Log Message:
-----------
Update build from wxwidgets version 2.8.12 (which does not run correctly
on Linux when linked to gtk+ version 3 that is built with epa_build) to to wxwidgets version 3.0.0.
Add configure option --with-gtk=3 to inform wxwidgets-3.0.0 that it is meant
to be built against gtk+ version 3.
Work around build bug introduced as of wxwidgets-3.0.0 for a
separate build tree by forcing an in-source build.
The result builds without issues on Linux and mostly produces
good run-time results with PLplot (see further discussion on list).
Modified Paths:
--------------
trunk/cmake/epa_build/wxwidgets/CMakeLists.txt
Modified: trunk/cmake/epa_build/wxwidgets/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/wxwidgets/CMakeLists.txt 2014-03-16 23:09:57 UTC (rev 13078)
+++ trunk/cmake/epa_build/wxwidgets/CMakeLists.txt 2014-03-17 04:46:07 UTC (rev 13079)
@@ -64,14 +64,20 @@
string(REGEX REPLACE "-fvisibility=hidden" "" CXXFLAGS "${CXXFLAGS}")
# Data that is related to downloads.
-set(URL http://prdownloads.sourceforge.net/wxwindows/wxWidgets-2.8.12.tar.gz)
-set(URL_MD5 2fa39da14bc06ea86fe902579fedc5b1)
+# N.B. 2.8.12 does not work properly with gtk+ version 3. At minimum
+# you need wxwidgets-2.9.4 (which is the first version to honor the
+# ---with-gtk=3 option below).
+#set(URL http://prdownloads.sourceforge.net/wxwindows/wxWidgets-2.8.12.tar.gz)
+#set(URL_HASH MD5=2fa39da14bc06ea86fe902579fedc5b1)
+set(URL http://prdownloads.sourceforge.net/wxwindows/3.0.0/wxWidgets-3.0.0.tar.bz2)
+set(URL_HASH SHA1=756a9c54d1f411e262f03bacb78ccef085a9880a)
ExternalProject_Add(
build_${PACKAGE}
URL ${URL}
- URL_MD5 ${URL_MD5}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-shared --enable-unicode --enable-debug --enable-debug_gdb ${toolkit_options}
+ URL_HASH ${URL_HASH}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-shared --enable-unicode --enable-debug --enable-debug_gdb --with-gtk=3 ${toolkit_options}
BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
+ BUILD_IN_SOURCE 1
INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-03-17 19:56:55
|
Revision: 13081
http://sourceforge.net/p/plplot/code/13081
Author: airwin
Date: 2014-03-17 19:56:51 +0000 (Mon, 17 Mar 2014)
Log Message:
-----------
Use --with-gtk=3 option only for non-Windows case.
Modified Paths:
--------------
trunk/cmake/epa_build/wxwidgets/CMakeLists.txt
Modified: trunk/cmake/epa_build/wxwidgets/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/wxwidgets/CMakeLists.txt 2014-03-17 04:50:38 UTC (rev 13080)
+++ trunk/cmake/epa_build/wxwidgets/CMakeLists.txt 2014-03-17 19:56:51 UTC (rev 13081)
@@ -55,6 +55,7 @@
# and therefore (now that epa_build has a gtk+ configuration)
# we must specificially add gtk+ as a dependency of wxwidgets.
list(APPEND dependencies_LIST gtk+)
+ set(toolkit_options --enable-debug --enable-debug_gdb --with-gtk=3)
endif(MSYS_PLATFORM)
set(CFLAGS "$ENV{CFLAGS}")
@@ -76,7 +77,7 @@
build_${PACKAGE}
URL ${URL}
URL_HASH ${URL_HASH}
- CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-shared --enable-unicode --enable-debug --enable-debug_gdb --with-gtk=3 ${toolkit_options}
+ CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-shared --enable-unicode ${toolkit_options}
BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND}
BUILD_IN_SOURCE 1
INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_MAKE_COMMAND} install
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-04-02 20:46:51
|
Revision: 13094
http://sourceforge.net/p/plplot/code/13094
Author: airwin
Date: 2014-04-02 20:46:46 +0000 (Wed, 02 Apr 2014)
Log Message:
-----------
Fix bugs (bad order, missing DEPENDS) in implementation of gtk+
dependency of wxwidgets in the Unix case.
Modified Paths:
--------------
trunk/cmake/epa_build/wxwidgets/CMakeLists.txt
Modified: trunk/cmake/epa_build/wxwidgets/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/wxwidgets/CMakeLists.txt 2014-04-02 07:42:07 UTC (rev 13093)
+++ trunk/cmake/epa_build/wxwidgets/CMakeLists.txt 2014-04-02 20:46:46 UTC (rev 13094)
@@ -24,7 +24,24 @@
# ignored.
set(ignored_dependencies_LIST ${extra_ignored_dependencies_list})
-set(dependencies_LIST)
+if(MSYS_PLATFORM)
+ # No dependencies required on Windows.
+ set(dependencies_LIST)
+else(MSYS_PLATFORM)
+ # To avoid having to build all of gtk with epa_build in a consistent
+ # manner I tried several alternatives to the gtk toolkit.
+ # e.g.,
+ # set(toolkit_options --with-x11)
+ # set(toolkit_options --with-motif)
+ # But neither of those worked because they are not capable of
+ # supplying the unicode (see --enable-unicode below) capability
+ # that is provided by the default gtk toolkit and needed by the
+ # PLplot build of the wxwidgets device.
+ # The inevitable conclusion is that on Unix, we must use the gtk toolkit
+ # and therefore (now that epa_build has a gtk+ configuration)
+ # we must specificially add gtk+ as a dependency of wxwidgets.
+ set(dependencies_LIST gtk+)
+endif(MSYS_PLATFORM)
# Do boilerplate tasks that must be done for each different project
# that is configured as part of epa_build.
@@ -39,22 +56,9 @@
if(MSYS_PLATFORM)
set(CXXFLAGS "-fno-keep-inline-dllexport $ENV{CXXFLAGS}")
- # No further dependencies required on Windows.
else(MSYS_PLATFORM)
set(CXXFLAGS "$ENV{CXXFLAGS}")
- # To avoid having to build all of gtk with epa_build in a consistent
- # manner I tried several alternatives to the gtk toolkit.
- # e.g.,
- # set(toolkit_options --with-x11)
- # set(toolkit_options --with-motif)
- # But neither of those worked because they are not capable of
- # supplying the unicode (see --enable-unicode below) capability
- # that is provided by the default gtk toolkit and needed by the
- # PLplot build of the wxwidgets device.
- # The inevitable conclusion is that on Unix, we must use the gtk toolkit
- # and therefore (now that epa_build has a gtk+ configuration)
- # we must specificially add gtk+ as a dependency of wxwidgets.
- list(APPEND dependencies_LIST gtk+)
+ # --with-gtk=3 because of gtk+ (version 3) dependency above
set(toolkit_options --enable-debug --enable-debug_gdb --with-gtk=3)
endif(MSYS_PLATFORM)
@@ -75,6 +79,7 @@
ExternalProject_Add(
build_${PACKAGE}
+ DEPENDS "${dependencies_targets}"
URL ${URL}
URL_HASH ${URL_HASH}
CONFIGURE_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} "CFLAGS=${CFLAGS}" "CXXFLAGS=${CXXFLAGS}" ${source_PATH}/${EPA_CONFIGURE_COMMAND} --enable-shared --enable-unicode ${toolkit_options}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X