Menu
▾
▴
plplot-cvs
|
From: <ai...@us...> - 2008-10-11 06:10:21
|
Revision: 8881
http://plplot.svn.sourceforge.net/plplot/?rev=8881&view=rev
Author: airwin
Date: 2008-10-11 06:10:19 +0000 (Sat, 11 Oct 2008)
Log Message:
-----------
Deal with case where source file COMPILE_FLAGS property is not found.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2008-10-11 01:50:08 UTC (rev 8880)
+++ trunk/src/CMakeLists.txt 2008-10-11 06:10:19 UTC (rev 8881)
@@ -58,6 +58,10 @@
if(ENABLE_DYNDRIVERS)
get_source_file_property(PLCORE_COMPILE_PROPS plcore.c COMPILE_FLAGS)
+ # Deal with NOTFOUND case.
+ if(NOT PLCORE_COMPILE_PROPS)
+ set(PLCORE_COMPILE_PROPS)
+ endif(NOT PLCORE_COMPILE_PROPS)
set_source_files_properties(
plcore.c
PROPERTIES COMPILE_FLAGS "${PLCORE_COMPILE_PROPS} -I${LTDL_INCLUDE_DIR}"
@@ -186,6 +190,10 @@
if(WITH_FREETYPE)
get_source_file_property(PLFREETYPE_COMPILE_PROPS plfreetype.c COMPILE_FLAGS)
+ # Deal with NOTFOUND case.
+ if(NOT PLFREETYPE_COMPILE_PROPS)
+ set(PLFREETYPE_COMPILE_PROPS)
+ endif(NOT PLFREETYPE_COMPILE_PROPS)
set_source_files_properties(plfreetype.c PROPERTIES COMPILE_FLAGS "${PLFREETYPE_COMPILE_PROPS} -I${FREETYPE_INCLUDE_DIR}")
set(
libplplot${LIB_TAG}_LINK_LIBRARIES
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-03-10 17:30:25
|
Revision: 9700
http://plplot.svn.sourceforge.net/plplot/?rev=9700&view=rev
Author: airwin
Date: 2009-03-10 17:30:10 +0000 (Tue, 10 Mar 2009)
Log Message:
-----------
Allow -dev qtwidgets to build properly for the -DENABLE_DYNDRIVERS=OFF case.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2009-03-10 16:59:15 UTC (rev 9699)
+++ trunk/src/CMakeLists.txt 2009-03-10 17:30:10 UTC (rev 9700)
@@ -99,10 +99,20 @@
set(DRIVERS_RPATH)
foreach(SOURCE_ROOT_NAME ${DRIVERS_LIST})
#message("${SOURCE_ROOT_NAME}_SOURCE = ${${SOURCE_ROOT_NAME}_SOURCE}")
- set(plplot${LIB_TAG}_LIB_SRCS
- ${plplot${LIB_TAG}_LIB_SRCS}
- ${${SOURCE_ROOT_NAME}_SOURCE}
- )
+ list(APPEND plplot${LIB_TAG}_LIB_SRCS ${${SOURCE_ROOT_NAME}_SOURCE})
+ if(SOURCE_ROOT_NAME STREQUAL "qt" AND PLD_qtwidget)
+ qt4_wrap_cpp(
+ QT_MOC_OUTFILES
+ ${CMAKE_SOURCE_DIR}/drivers/qt.h
+ OPTIONS "-DPLD_qtwidget=ON"
+ )
+ # message("QT_MOC_OUTFILES = ${QT_MOC_OUTFILES}")
+ set_source_files_properties(
+ ${QT_MOC_OUTFILES}
+ PROPERTIES GENERATED "ON"
+ )
+ list(APPEND plplot${LIB_TAG}_LIB_SRCS ${QT_MOC_OUTFILES})
+ endif(SOURCE_ROOT_NAME STREQUAL "qt" AND PLD_qtwidget)
if(${SOURCE_ROOT_NAME}_COMPILE_FLAGS)
set_source_files_properties(
${${SOURCE_ROOT_NAME}_SOURCE}
@@ -137,6 +147,9 @@
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/include
)
+if(NOT ENABLE_DYNDRIVERS AND PLD_cgm)
+ include_directories(${CMAKE_SOURCE_DIR}/lib/nistcd)
+endif(NOT ENABLE_DYNDRIVERS AND PLD_cgm)
add_library(plplot${LIB_TAG} ${plplot${LIB_TAG}_LIB_SRCS})
add_dependencies(plplot${LIB_TAG} plhershey-unicode.h_built)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-05-03 11:14:14
|
Revision: 9888
http://plplot.svn.sourceforge.net/plplot/?rev=9888&view=rev
Author: airwin
Date: 2009-05-03 11:14:05 +0000 (Sun, 03 May 2009)
Log Message:
-----------
Use correct location of qt.h when generating moc output for
-DENABLE_DYNDRIVERS=OFF case.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2009-05-03 00:59:42 UTC (rev 9887)
+++ trunk/src/CMakeLists.txt 2009-05-03 11:14:05 UTC (rev 9888)
@@ -135,7 +135,7 @@
if(MOC_OPTIONS)
qt4_wrap_cpp(
QT_MOC_OUTFILES
- ${CMAKE_CURRENT_SOURCE_DIR}/qt.h
+ ${CMAKE_SOURCE_DIR}/drivers/qt.h
OPTIONS ${MOC_OPTIONS}
)
# message("QT_MOC_OUTFILES = ${QT_MOC_OUTFILES}")
@@ -194,6 +194,7 @@
set(libplplot${LIB_TAG}_LINK_LIBRARIES ${DRIVERS_LINK_FLAGS})
set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${DRIVERS_RPATH})
endif(ENABLE_DYNDRIVERS)
+#message("LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}")
if(MATH_LIB)
set(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-05-05 06:31:34
|
Revision: 9913
http://plplot.svn.sourceforge.net/plplot/?rev=9913&view=rev
Author: airwin
Date: 2009-05-05 06:31:25 +0000 (Tue, 05 May 2009)
Log Message:
-----------
Use -DUSINGDLL compile option for qt code that becomes part of libplplot for
the -DBUILD_SHARED_LIBS=ON -DENABLE_DYNDRIVERS=OFF case. This build system
bug fix allows qt_example (which uses symbols in qt) to link correctly
without symbol visibility issues (as tested by -fvisibility=hidden on
Linux).
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2009-05-05 06:23:00 UTC (rev 9912)
+++ trunk/src/CMakeLists.txt 2009-05-05 06:31:25 UTC (rev 9913)
@@ -146,6 +146,13 @@
list(APPEND plplot${LIB_TAG}_LIB_SRCS ${QT_MOC_OUTFILES})
endif(MOC_OPTIONS)
endif(SOURCE_ROOT_NAME STREQUAL "qt")
+
+ # qt device driver code within libplplot has some symbols that need to be
+ # visible for qt_example in installed examples/c++ directory to link
+ # properly.
+ if(BUILD_SHARED_LIBS AND SOURCE_ROOT_NAME STREQUAL "qt")
+ set(${SOURCE_ROOT_NAME}_COMPILE_FLAGS "${${SOURCE_ROOT_NAME}_COMPILE_FLAGS} -DUSINGDLL")
+ endif(BUILD_SHARED_LIBS AND SOURCE_ROOT_NAME STREQUAL "qt")
if(${SOURCE_ROOT_NAME}_COMPILE_FLAGS)
set_source_files_properties(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-01-29 22:20:12
|
Revision: 10776
http://plplot.svn.sourceforge.net/plplot/?rev=10776&view=rev
Author: airwin
Date: 2010-01-29 22:20:06 +0000 (Fri, 29 Jan 2010)
Log Message:
-----------
Oops. Commit final version of change with better documentation and commented
out debug messages.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2010-01-29 22:18:41 UTC (rev 10775)
+++ trunk/src/CMakeLists.txt 2010-01-29 22:20:06 UTC (rev 10776)
@@ -280,12 +280,16 @@
${libplplot${LIB_TAG}_LINK_LIBRARIES}
)
-# Temporary workaround until this filtering functionality automatically
-# supplied by CMake.
+# Temporary crude workaround until this run-time default library location
+# filtering functionality (which is bound to vary from platform to platform)
+# is automatically supplied by CMake. Note this only fixes the issue
+# for libplplotd and the libraries and plugins that depend on it,
+# but does not fix the issue for, e.g., other mixtures of shared
+# libraries that driver plug-ins might depend upon.
list(REMOVE_DUPLICATES LIB_INSTALL_RPATH)
list(REMOVE_ITEM LIB_INSTALL_RPATH "/usr/lib")
-message("DEBUG: LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}")
+#message("DEBUG: LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}")
if(USE_RPATH)
set_target_properties(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-02-08 19:42:45
|
Revision: 10799
http://plplot.svn.sourceforge.net/plplot/?rev=10799&view=rev
Author: airwin
Date: 2010-02-08 19:42:36 +0000 (Mon, 08 Feb 2010)
Log Message:
-----------
Use filtered QHULL_RPATH as appropriate.
Get rid of incomplete RPATH filtering here which has been replaced by
complete filtering where all the RPATH related variables are defined in
cmake/modules/*.cmake.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2010-02-08 19:40:17 UTC (rev 10798)
+++ trunk/src/CMakeLists.txt 2010-02-08 19:42:36 UTC (rev 10799)
@@ -211,17 +211,24 @@
${libplplot${LIB_TAG}_LINK_LIBRARIES}
csironn
)
- set(
- libplplot${LIB_TAG}_LINK_FLAGS
- "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsironn -L${QHULL_LIBRARY_DIRS} -lqhull"
- )
+ if(QHULL_RPATH)
+ set(
+ libplplot${LIB_TAG}_LINK_FLAGS
+ "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsironn -L${QHULL_PATH} -lqhull"
+ )
+ else(QHULL_RPATH)
+ set(
+ libplplot${LIB_TAG}_LINK_FLAGS
+ "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsironn -lqhull"
+ )
+ endif(QHULL_RPATH)
# Needed by plgridd.c.
include_directories(
${QHULL_INCLUDE_DIRS}
)
# Needed by the traditional pkg-config approach for installed examples
# as well as the new CMake-based build system for the installed examples.
- set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${QHULL_LIBRARY_DIRS})
+ set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${QHULL_RPATH})
endif(HAVE_QHULL)
if(NOT ENABLE_DYNDRIVERS AND PLD_cgm)
@@ -280,17 +287,6 @@
${libplplot${LIB_TAG}_LINK_LIBRARIES}
)
-# Temporary crude workaround until this run-time default library location
-# filtering functionality (which is bound to vary from platform to platform)
-# is automatically supplied by CMake. Note this only fixes the issue
-# for libplplotd and the libraries and plugins that depend on it,
-# but does not fix the issue for, e.g., other mixtures of shared
-# libraries that driver plug-ins might depend upon.
-
-list(REMOVE_DUPLICATES LIB_INSTALL_RPATH)
-list(REMOVE_ITEM LIB_INSTALL_RPATH "/usr/lib")
-#message("DEBUG: LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}")
-
if(USE_RPATH)
set_target_properties(
plplot${LIB_TAG}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-12-12 22:09:09
|
Revision: 12860
http://sourceforge.net/p/plplot/code/12860
Author: airwin
Date: 2013-12-12 22:09:07 +0000 (Thu, 12 Dec 2013)
Log Message:
-----------
Fix build system bug recently introduced for combination of disabled
qt and disabled dynamic devices. (Thanks to Phil Rosenberg for
spotting this.)
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2013-12-12 21:51:56 UTC (rev 12859)
+++ trunk/src/CMakeLists.txt 2013-12-12 22:09:07 UTC (rev 12860)
@@ -200,8 +200,10 @@
else(ENABLE_DYNDRIVERS)
set(libplplot${LIB_TAG}_LINK_LIBRARIES ${DRIVERS_LINK_FLAGS})
set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${DRIVERS_RPATH})
- # Update the target COMPILE_DEFINITIONS and INCLUDE_DIRECTORIES
- set_qt_target_properties(plplot${LIB_TAG})
+ if(ANY_QT_DEVICE)
+ # Update the target COMPILE_DEFINITIONS and INCLUDE_DIRECTORIES
+ set_qt_target_properties(plplot${LIB_TAG})
+ endif(ANY_QT_DEVICE)
endif(ENABLE_DYNDRIVERS)
#message("DEBUG: LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}")
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-03-13 23:01:27
|
Revision: 13053
http://sourceforge.net/p/plplot/code/13053
Author: airwin
Date: 2014-03-13 23:01:25 +0000 (Thu, 13 Mar 2014)
Log Message:
-----------
Only call set_qt_target_properties for the Qt4 case. (The Qt5 case is
handled an entirely different way that never involves
set_qt_target_properties.)
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2014-03-13 19:26:25 UTC (rev 13052)
+++ trunk/src/CMakeLists.txt 2014-03-13 23:01:25 UTC (rev 13053)
@@ -213,11 +213,11 @@
else(ENABLE_DYNDRIVERS)
list(APPEND libplplot${LIB_TAG}_LINK_LIBRARIES ${DRIVERS_LINK_FLAGS})
list(APPEND LIB_INSTALL_RPATH ${DRIVERS_RPATH})
- if(ANY_QT_DEVICE)
+ if(ANY_QT_DEVICE AND NOT PLPLOT_USE_QT5)
# Update the target COMPILE_DEFINITIONS and INCLUDE_DIRECTORIES
set_qt_target_properties(plplot${LIB_TAG})
endif(ANY_QT_DEVICE)
-endif(ENABLE_DYNDRIVERS)
+endif(ENABLE_DYNDRIVERS AND NOT PLPLOT_USE_QT5)
#message("DEBUG: LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}")
if(MATH_LIB)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-06-28 08:46:47
|
Revision: 10087
http://plplot.svn.sourceforge.net/plplot/?rev=10087&view=rev
Author: airwin
Date: 2009-06-28 08:46:21 +0000 (Sun, 28 Jun 2009)
Log Message:
-----------
Indentation fixup.
Change qt.h location from drivers subdirectory to include subdirectory.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2009-06-28 08:26:11 UTC (rev 10086)
+++ trunk/src/CMakeLists.txt 2009-06-28 08:46:21 UTC (rev 10087)
@@ -20,44 +20,44 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
set(plplot${LIB_TAG}_LIB_SRCS
-pdfutils.c
-plargs.c
-plbox.c
-plcont.c
-plcore.c
-plctrl.c
-plcvt.c
-pldeprecated.c
-pldtik.c
-plfill.c
-plfreetype.c
-plhist.c
-plimage.c
-plline.c
-plmap.c
-plot3d.c
-plpage.c
-plsdef.c
-plshade.c
-plstdio.c
-plstripc.c
-plsym.c
-pltick.c
-plvpor.c
-plwind.c
-plbuf.c
-plgridd.c
-plvect.c
-mt19937ar.c
-pltime.c
-)
+ pdfutils.c
+ plargs.c
+ plbox.c
+ plcont.c
+ plcore.c
+ plctrl.c
+ plcvt.c
+ pldeprecated.c
+ pldtik.c
+ plfill.c
+ plfreetype.c
+ plhist.c
+ plimage.c
+ plline.c
+ plmap.c
+ plot3d.c
+ plpage.c
+ plsdef.c
+ plshade.c
+ plstdio.c
+ plstripc.c
+ plsym.c
+ pltick.c
+ plvpor.c
+ plwind.c
+ plbuf.c
+ plgridd.c
+ plvect.c
+ mt19937ar.c
+ pltime.c
+ )
if(LTDL_WIN32)
set(plplot${LIB_TAG}_LIB_SRCS ${plplot${LIB_TAG}_LIB_SRCS} ltdl_win32.c)
endif(LTDL_WIN32)
if(BUILD_SHARED_LIBS)
SET_SOURCE_FILES_PROPERTIES(${plplot${LIB_TAG}_LIB_SRCS}
- PROPERTIES COMPILE_FLAGS "-DUSINGDLL" )
+ PROPERTIES COMPILE_FLAGS "-DUSINGDLL" )
endif(BUILD_SHARED_LIBS)
if(ENABLE_DYNDRIVERS)
@@ -67,32 +67,32 @@
set(PLCORE_COMPILE_PROPS)
endif(NOT PLCORE_COMPILE_PROPS)
set_source_files_properties(
- plcore.c
- PROPERTIES COMPILE_FLAGS "${PLCORE_COMPILE_PROPS} -I${LTDL_INCLUDE_DIR}"
- )
+ plcore.c
+ PROPERTIES COMPILE_FLAGS "${PLCORE_COMPILE_PROPS} -I${LTDL_INCLUDE_DIR}"
+ )
else(ENABLE_DYNDRIVERS)
if(ENABLE_tcl)
set(
- tclgenfiles
- ${CMAKE_BINARY_DIR}/bindings/tcl/tclgen.h
- ${CMAKE_BINARY_DIR}/bindings/tcl/tclgen_s.h
- ${CMAKE_BINARY_DIR}/bindings/tcl/tclgen.c
- )
+ tclgenfiles
+ ${CMAKE_BINARY_DIR}/bindings/tcl/tclgen.h
+ ${CMAKE_BINARY_DIR}/bindings/tcl/tclgen_s.h
+ ${CMAKE_BINARY_DIR}/bindings/tcl/tclgen.c
+ )
# Only need to set up this special command if either the tk and tkwin
# non-dynamic devices are enabled (see below) since at build time
# this special command is only fired in that case.
add_custom_command(
- OUTPUT ${tclgenfiles}
- COMMAND ${TCL_TCLSH}
- ${CMAKE_SOURCE_DIR}/bindings/tcl/pltclgen.tcl
- ${CMAKE_SOURCE_DIR}/bindings/tcl
- DEPENDS
- ${CMAKE_SOURCE_DIR}/bindings/tcl/pltclgen.tcl
- ${CMAKE_SOURCE_DIR}/bindings/tcl/plapi.tpl
- ${CMAKE_SOURCE_DIR}/bindings/tcl/tclcmd.tpl
- WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bindings/tcl
- )
+ OUTPUT ${tclgenfiles}
+ COMMAND ${TCL_TCLSH}
+ ${CMAKE_SOURCE_DIR}/bindings/tcl/pltclgen.tcl
+ ${CMAKE_SOURCE_DIR}/bindings/tcl
+ DEPENDS
+ ${CMAKE_SOURCE_DIR}/bindings/tcl/pltclgen.tcl
+ ${CMAKE_SOURCE_DIR}/bindings/tcl/plapi.tpl
+ ${CMAKE_SOURCE_DIR}/bindings/tcl/tclcmd.tpl
+ WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/bindings/tcl
+ )
endif(ENABLE_tcl)
# Static device drivers must be included in the core PLplot library.
@@ -135,7 +135,7 @@
if(MOC_OPTIONS)
qt4_wrap_cpp(
QT_MOC_OUTFILES
- ${CMAKE_SOURCE_DIR}/drivers/qt.h
+ ${CMAKE_SOURCE_DIR}/include/qt.h
OPTIONS ${MOC_OPTIONS}
)
# message("QT_MOC_OUTFILES = ${QT_MOC_OUTFILES}")
@@ -156,24 +156,24 @@
if(${SOURCE_ROOT_NAME}_COMPILE_FLAGS)
set_source_files_properties(
- ${${SOURCE_ROOT_NAME}_SOURCE}
- PROPERTIES COMPILE_FLAGS ${${SOURCE_ROOT_NAME}_COMPILE_FLAGS}
- )
+ ${${SOURCE_ROOT_NAME}_SOURCE}
+ PROPERTIES COMPILE_FLAGS ${${SOURCE_ROOT_NAME}_COMPILE_FLAGS}
+ )
set(libplplot${LIB_TAG}_COMPILE_FLAGS
- ${libplplot${LIB_TAG}_COMPILE_FLAGS}
- ${${SOURCE_ROOT_NAME}_COMPILE_FLAGS}
- )
+ ${libplplot${LIB_TAG}_COMPILE_FLAGS}
+ ${${SOURCE_ROOT_NAME}_COMPILE_FLAGS}
+ )
if(SOURCE_ROOT_NAME STREQUAL "tk")
set_source_files_properties(
- ${${SOURCE_ROOT_NAME}_SOURCE}
- PROPERTIES OBJECT_DEPENDS ${tclgenfiles}
- )
+ ${${SOURCE_ROOT_NAME}_SOURCE}
+ PROPERTIES OBJECT_DEPENDS ${tclgenfiles}
+ )
endif(SOURCE_ROOT_NAME STREQUAL "tk")
if(SOURCE_ROOT_NAME STREQUAL "tkwin")
set_source_files_properties(
- ${${SOURCE_ROOT_NAME}_SOURCE}
- PROPERTIES OBJECT_DEPENDS ${tclgenfiles}
- )
+ ${${SOURCE_ROOT_NAME}_SOURCE}
+ PROPERTIES OBJECT_DEPENDS ${tclgenfiles}
+ )
endif(SOURCE_ROOT_NAME STREQUAL "tkwin")
endif(${SOURCE_ROOT_NAME}_COMPILE_FLAGS)
if(${SOURCE_ROOT_NAME}_RPATH)
@@ -183,11 +183,11 @@
endif(ENABLE_DYNDRIVERS)
include_directories(
-${CMAKE_SOURCE_DIR}/include
-${CMAKE_SOURCE_DIR}/lib/qsastime
-${CMAKE_BINARY_DIR}
-${CMAKE_BINARY_DIR}/include
-)
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_SOURCE_DIR}/lib/qsastime
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}/include
+ )
add_library(plplot${LIB_TAG} ${plplot${LIB_TAG}_LIB_SRCS})
add_dependencies(plplot${LIB_TAG} plhershey-unicode.h_built)
@@ -205,52 +205,52 @@
if(MATH_LIB)
set(
- libplplot${LIB_TAG}_LINK_LIBRARIES
- ${libplplot${LIB_TAG}_LINK_LIBRARIES}
- ${MATH_LIB}
- )
+ libplplot${LIB_TAG}_LINK_LIBRARIES
+ ${libplplot${LIB_TAG}_LINK_LIBRARIES}
+ ${MATH_LIB}
+ )
endif(MATH_LIB)
# Transform "${libplplot${LIB_TAG}_LINK_LIBRARIES}" string to the
# standard pkg-config form.
pkg_config_link_flags(
-libplplot${LIB_TAG}_LINK_FLAGS
-"${libplplot${LIB_TAG}_LINK_LIBRARIES}"
-)
+ libplplot${LIB_TAG}_LINK_FLAGS
+ "${libplplot${LIB_TAG}_LINK_LIBRARIES}"
+ )
if(WITH_CSA)
set(
- libplplot${LIB_TAG}_LINK_LIBRARIES
- ${libplplot${LIB_TAG}_LINK_LIBRARIES}
- csirocsa
- )
+ libplplot${LIB_TAG}_LINK_LIBRARIES
+ ${libplplot${LIB_TAG}_LINK_LIBRARIES}
+ csirocsa
+ )
set(
- libplplot${LIB_TAG}_LINK_FLAGS
- "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsirocsa"
- )
+ libplplot${LIB_TAG}_LINK_FLAGS
+ "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsirocsa"
+ )
endif(WITH_CSA)
if(HAVE_QHULL)
set(
- libplplot${LIB_TAG}_LINK_LIBRARIES
- ${libplplot${LIB_TAG}_LINK_LIBRARIES}
- csironn
- )
+ libplplot${LIB_TAG}_LINK_LIBRARIES
+ ${libplplot${LIB_TAG}_LINK_LIBRARIES}
+ csironn
+ )
set(
- libplplot${LIB_TAG}_LINK_FLAGS
- "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsironn -lqhull"
- )
+ libplplot${LIB_TAG}_LINK_FLAGS
+ "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsironn -lqhull"
+ )
include_directories(
${QHULL_INCLUDE_DIRS}
- )
+ )
endif(HAVE_QHULL)
if(NOT ENABLE_DYNDRIVERS AND PLD_cgm)
list(APPEND libplplot${LIB_TAG}_LINK_LIBRARIES nistcd)
set(
- libplplot${LIB_TAG}_LINK_FLAGS
- "${libplplot${LIB_TAG}_LINK_FLAGS} -lnistcd"
- )
+ libplplot${LIB_TAG}_LINK_FLAGS
+ "${libplplot${LIB_TAG}_LINK_FLAGS} -lnistcd"
+ )
include_directories(${CMAKE_SOURCE_DIR}/lib/nistcd)
endif(NOT ENABLE_DYNDRIVERS AND PLD_cgm)
@@ -272,24 +272,24 @@
endif(NOT PLFREETYPE_COMPILE_PROPS)
set_source_files_properties(plfreetype.c PROPERTIES COMPILE_FLAGS "${PLFREETYPE_COMPILE_PROPS} -I${FREETYPE_INCLUDE_DIR}")
set(
- libplplot${LIB_TAG}_LINK_LIBRARIES
- ${libplplot${LIB_TAG}_LINK_LIBRARIES}
- ${FREETYPE_LIBRARIES}
- )
+ libplplot${LIB_TAG}_LINK_LIBRARIES
+ ${libplplot${LIB_TAG}_LINK_LIBRARIES}
+ ${FREETYPE_LIBRARIES}
+ )
# Convert to -L... -l... form.
string(REGEX REPLACE "(/[^ ]*)/lib([^ ]*)\\.so" "-L\\1 -l\\2"
- _FREETYPE_LINK_FLAGS
- ${FREETYPE_LIBRARIES}
- )
+ _FREETYPE_LINK_FLAGS
+ ${FREETYPE_LIBRARIES}
+ )
string(REGEX REPLACE "(/[^ ]*)/lib([^ ]*)\\.so" "-L\\1 -l\\2"
- FREETYPE_LINK_FLAGS
- ${_FREETYPE_LINK_FLAGS}
- )
+ FREETYPE_LINK_FLAGS
+ ${_FREETYPE_LINK_FLAGS}
+ )
set(
- libplplot${LIB_TAG}_LINK_FLAGS
- "${libplplot${LIB_TAG}_LINK_FLAGS} ${FREETYPE_LINK_FLAGS}"
- )
+ libplplot${LIB_TAG}_LINK_FLAGS
+ "${libplplot${LIB_TAG}_LINK_FLAGS} ${FREETYPE_LINK_FLAGS}"
+ )
endif(WITH_FREETYPE)
#message(STATUS
@@ -297,43 +297,43 @@
#)
target_link_libraries(
-plplot${LIB_TAG}
-${libplplot${LIB_TAG}_LINK_LIBRARIES}
-)
+ plplot${LIB_TAG}
+ ${libplplot${LIB_TAG}_LINK_LIBRARIES}
+ )
if(USE_RPATH)
set_target_properties(
- plplot${LIB_TAG}
- PROPERTIES
- SOVERSION ${plplot_SOVERSION}
- VERSION ${plplot_VERSION}
- INSTALL_RPATH "${LIB_INSTALL_RPATH}"
- INSTALL_NAME_DIR "${LIB_DIR}"
- )
+ plplot${LIB_TAG}
+ PROPERTIES
+ SOVERSION ${plplot_SOVERSION}
+ VERSION ${plplot_VERSION}
+ INSTALL_RPATH "${LIB_INSTALL_RPATH}"
+ INSTALL_NAME_DIR "${LIB_DIR}"
+ )
else(USE_RPATH)
set_target_properties(
- plplot${LIB_TAG}
- PROPERTIES
- SOVERSION ${plplot_SOVERSION}
- VERSION ${plplot_VERSION}
- INSTALL_NAME_DIR "${LIB_DIR}"
- )
+ plplot${LIB_TAG}
+ PROPERTIES
+ SOVERSION ${plplot_SOVERSION}
+ VERSION ${plplot_VERSION}
+ INSTALL_NAME_DIR "${LIB_DIR}"
+ )
endif(USE_RPATH)
install(TARGETS plplot${LIB_TAG}
-EXPORT export_plplot
-ARCHIVE DESTINATION ${LIB_DIR}
-LIBRARY DESTINATION ${LIB_DIR}
-RUNTIME DESTINATION ${BIN_DIR}
-)
+ EXPORT export_plplot
+ ARCHIVE DESTINATION ${LIB_DIR}
+ LIBRARY DESTINATION ${LIB_DIR}
+ RUNTIME DESTINATION ${BIN_DIR}
+ )
install(EXPORT export_plplot DESTINATION ${DATA_DIR}/examples/cmake/modules)
#message("libplplot${LIB_TAG}_LINK_FLAGS = ${libplplot${LIB_TAG}_LINK_FLAGS}")
string(REGEX REPLACE ";" " "
-libplplot${LIB_TAG}_COMPILE_FLAGS
-"${libplplot${LIB_TAG}_COMPILE_FLAGS}"
-)
+ libplplot${LIB_TAG}_COMPILE_FLAGS
+ "${libplplot${LIB_TAG}_COMPILE_FLAGS}"
+ )
#message("libplplot${LIB_TAG}_COMPILE_FLAGS = ${libplplot${LIB_TAG}_COMPILE_FLAGS}")
# Configure pkg-config *.pc file corresponding to libplplot${LIB_TAG}
@@ -369,13 +369,12 @@
set(PC_LINK_FLAGS "-l${PC_LIBRARY_NAME} ${PC_LINK_FLAGS}")
set(PC_COMPILE_FLAGS "${lib${PC_LIBRARY_NAME}_COMPILE_FLAGS}")
set(PC_CONFIGURED_FILE
- ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc
- )
+ ${CMAKE_BINARY_DIR}/pkgcfg/plplot${LIB_TAG}${PC_FILE_SUFFIX}.pc
+ )
configure_file(
- ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.cmake
- ${PC_CONFIGURED_FILE}
- @ONLY
- )
+ ${CMAKE_SOURCE_DIR}/pkgcfg/plplot-template.pc.cmake
+ ${PC_CONFIGURED_FILE}
+ @ONLY
+ )
install(FILES ${PC_CONFIGURED_FILE} DESTINATION ${PKG_CONFIG_DIR})
endif(PKG_CONFIG_EXECUTABLE)
-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-01-14 19:44:19
|
Revision: 10753
http://plplot.svn.sourceforge.net/plplot/?rev=10753&view=rev
Author: airwin
Date: 2010-01-14 19:43:31 +0000 (Thu, 14 Jan 2010)
Log Message:
-----------
Correct qhull location issues for pkg-config. Warning: I think this should
work, but I am not in a position to test it for a week or so.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2010-01-14 05:26:21 UTC (rev 10752)
+++ trunk/src/CMakeLists.txt 2010-01-14 19:43:31 UTC (rev 10753)
@@ -213,11 +213,14 @@
)
set(
libplplot${LIB_TAG}_LINK_FLAGS
- "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsironn -lqhull"
+ "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsironn -L${QHULL_LIBRARY_DIRS} -lqhull"
)
+ # Needed by plgridd.c.
include_directories(
${QHULL_INCLUDE_DIRS}
)
+ # Needed by traditional pkg-config approach for installed examples.
+ set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${QHULL_LIBRARY_DIRS})
endif(HAVE_QHULL)
if(NOT ENABLE_DYNDRIVERS AND PLD_cgm)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-01-29 22:18:47
|
Revision: 10775
http://plplot.svn.sourceforge.net/plplot/?rev=10775&view=rev
Author: airwin
Date: 2010-01-29 22:18:41 +0000 (Fri, 29 Jan 2010)
Log Message:
-----------
Filter /usr/lib out of libplplotd install RPATH. This is a (hopefully)
temporary workaround until CMake can supply this filtering functionality
(like they currently do for build-tree libraries). The workaround has only
been applied to libplplotd and every library that uses its rpath. So the
workaround is probably okay, but theoretically there is a potential issue
for our plug-ins as well (if their special non-plplot external library
dependencies include standard and non-standard library locations).
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2010-01-29 09:10:37 UTC (rev 10774)
+++ trunk/src/CMakeLists.txt 2010-01-29 22:18:41 UTC (rev 10775)
@@ -176,7 +176,7 @@
set(libplplot${LIB_TAG}_LINK_LIBRARIES ${DRIVERS_LINK_FLAGS})
set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${DRIVERS_RPATH})
endif(ENABLE_DYNDRIVERS)
-#message("LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}")
+#message("DEBUG: LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}")
if(MATH_LIB)
set(
@@ -219,7 +219,8 @@
include_directories(
${QHULL_INCLUDE_DIRS}
)
- # Needed by traditional pkg-config approach for installed examples.
+ # Needed by the traditional pkg-config approach for installed examples
+ # as well as the new CMake-based build system for the installed examples.
set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${QHULL_LIBRARY_DIRS})
endif(HAVE_QHULL)
@@ -279,6 +280,13 @@
${libplplot${LIB_TAG}_LINK_LIBRARIES}
)
+# Temporary workaround until this filtering functionality automatically
+# supplied by CMake.
+
+list(REMOVE_DUPLICATES LIB_INSTALL_RPATH)
+list(REMOVE_ITEM LIB_INSTALL_RPATH "/usr/lib")
+message("DEBUG: LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}")
+
if(USE_RPATH)
set_target_properties(
plplot${LIB_TAG}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-02-09 22:58:34
|
Revision: 10800
http://plplot.svn.sourceforge.net/plplot/?rev=10800&view=rev
Author: airwin
Date: 2010-02-09 22:58:28 +0000 (Tue, 09 Feb 2010)
Log Message:
-----------
Fix QHULL_PATH ==> QHULL_RPATH typo. Thanks to David MacMahon for spotting
this.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2010-02-08 19:42:36 UTC (rev 10799)
+++ trunk/src/CMakeLists.txt 2010-02-09 22:58:28 UTC (rev 10800)
@@ -214,7 +214,7 @@
if(QHULL_RPATH)
set(
libplplot${LIB_TAG}_LINK_FLAGS
- "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsironn -L${QHULL_PATH} -lqhull"
+ "${libplplot${LIB_TAG}_LINK_FLAGS} -lcsironn -L${QHULL_RPATH} -lqhull"
)
else(QHULL_RPATH)
set(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-04-11 15:20:57
|
Revision: 10899
http://plplot.svn.sourceforge.net/plplot/?rev=10899&view=rev
Author: airwin
Date: 2010-04-11 15:20:51 +0000 (Sun, 11 Apr 2010)
Log Message:
-----------
Implement HERSHEY_FALLBACK option which replaces Unicode with Hershey glyphs
if no unicode alternative is available in the translation table from Hershey
index to Unicode index. We normally want this replacement so the default
for this option is ON, but turning this option OFF allows our developers to
see where our translation table from Hershey to Unicode needs work.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2010-04-11 05:05:48 UTC (rev 10898)
+++ trunk/src/CMakeLists.txt 2010-04-11 15:20:51 UTC (rev 10899)
@@ -65,6 +65,19 @@
PROPERTIES COMPILE_FLAGS "-DUSINGDLL" )
endif(BUILD_SHARED_LIBS)
+option(HERSHEY_FALLBACK "Hershey fallback for Unicode fonts" ON)
+
+if(NOT HERSHEY_FALLBACK)
+ get_source_file_property(PLSYM_COMPILE_PROPS plsym.c COMPILE_FLAGS)
+ if(NOT PLSYM_COMPILE_PROPS)
+ set(PLSYM_COMPILE_PROPS)
+ endif(NOT PLSYM_COMPILE_PROPS)
+ set_source_files_properties(
+ plsym.c
+ PROPERTIES COMPILE_FLAGS "${PLSYM_COMPILE_PROPS} -DTEST_FOR_MISSING_GLYPHS"
+ )
+endif(NOT HERSHEY_FALLBACK)
+
if(ENABLE_DYNDRIVERS)
get_source_file_property(PLCORE_COMPILE_PROPS plcore.c COMPILE_FLAGS)
# Deal with NOTFOUND case.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2011-10-19 19:21:28
|
Revision: 11978
http://plplot.svn.sourceforge.net/plplot/?rev=11978&view=rev
Author: andrewross
Date: 2011-10-19 19:21:21 +0000 (Wed, 19 Oct 2011)
Log Message:
-----------
Only compile src/pldeprecated.c if PL_DEPRECATED is defined. This avoids a warning about an empty translation unit which breaches the ISO C standard.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2011-10-19 14:43:26 UTC (rev 11977)
+++ trunk/src/CMakeLists.txt 2011-10-19 19:21:21 UTC (rev 11978)
@@ -29,7 +29,6 @@
plcore.c
plctrl.c
plcvt.c
- pldeprecated.c
pldtik.c
plf2ops.c
plfill.c
@@ -56,6 +55,9 @@
pltime.c
pllegend.c
)
+if(PL_DEPRECATED)
+ set(plplot${LIB_TAG}_LIB_SRCS ${plplot${LIB_TAG}_LIB_SRCS} pldeprecated.c)
+endif(PL_DEPRECATED)
if(LTDL_WIN32)
set(plplot${LIB_TAG}_LIB_SRCS ${plplot${LIB_TAG}_LIB_SRCS} ltdl_win32.c)
endif(LTDL_WIN32)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2012-10-11 21:53:13
|
Revision: 12244
http://plplot.svn.sourceforge.net/plplot/?rev=12244&view=rev
Author: andrewross
Date: 2012-10-11 21:53:07 +0000 (Thu, 11 Oct 2012)
Log Message:
-----------
Updates to plplot cmake support shapelib.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2012-10-10 22:17:10 UTC (rev 12243)
+++ trunk/src/CMakeLists.txt 2012-10-11 21:53:07 UTC (rev 12244)
@@ -305,6 +305,34 @@
)
endif(WITH_FREETYPE)
+if(HAVE_SHAPELIB)
+ get_source_file_property(PLMAP_COMPILE_PROPS plmap.c COMPILE_FLAGS)
+ # Deal with NOTFOUND case.
+ if(NOT PLMAP_COMPILE_PROPS)
+ set(PLMAP_COMPILE_PROPS)
+ endif(NOT PLMAP_COMPILE_PROPS)
+ set_source_files_properties(plmap.c PROPERTIES COMPILE_FLAGS "${PLMAP_COMPILE_PROPS} -I${SHAPELIB_INCLUDE_DIR}")
+ set(
+ libplplot${LIB_TAG}_LINK_LIBRARIES
+ ${libplplot${LIB_TAG}_LINK_LIBRARIES}
+ ${SHAPELIB_LIBRARIES}
+ )
+
+ # Convert to -L... -l... form.
+ string(REGEX REPLACE "(/[^ ]*)/lib([^ ]*)\\.so" "-L\\1 -l\\2"
+ _SHAPELIB_LINK_FLAGS
+ ${SHAPELIB_LIBRARIES}
+ )
+ string(REGEX REPLACE "(/[^ ]*)/lib([^ ]*)\\.so" "-L\\1 -l\\2"
+ SHAPELIB_LINK_FLAGS
+ ${_SHAPELIB_LINK_FLAGS}
+ )
+ set(
+ libplplot${LIB_TAG}_LINK_FLAGS
+ "${libplplot${LIB_TAG}_LINK_FLAGS} ${SHAPELIB_LINK_FLAGS}"
+ )
+endif(HAVE_SHAPELIB)
+
#message(STATUS
#"libplplot${LIB_TAG}_LINK_LIBRARIES = ${libplplot${LIB_TAG}_LINK_LIBRARIES}"
#)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-04-26 22:43:58
|
Revision: 12309
http://sourceforge.net/p/plplot/code/12309
Author: airwin
Date: 2013-04-26 22:43:53 +0000 (Fri, 26 Apr 2013)
Log Message:
-----------
This fix puts the location (in -L, -l form) of the C++ library
associated with the C++ compiler in the list of library options
contained in the plplotd.pc file configured and installed by our build
system for the case where BUILD_SHARED_LIBS is not true. For that
unique case alone, the plplotd library turns into a static C++ library
because of the C++ device driver code that is compiled into that
library, and the traditional (i.e., using "make" and pkg-config) build
of the installed examples fails without this fix to the configured
plplotd.pc file.
There are some caveats for this logic.
* The find_library CMake logic assumes the name of the library is
"stdc++". That is certainly the correct name on Linux. Other names
could be added if some other kinds of systems have a different name
for that library.
* The find_library logic uses PATHS which are determined by parsing
the results of c++ --verbose --version. That parsing should only work
for the extremely specific --verbose --version output of the GCC C++
compiler, but that is a pretty important case, and I am glad to get
the traditional build of the installed examples to work again for
that compiler for the static PLplot library case.
Others should feel free to generalize this logic to different
names for the C++ library and other C++ compilers.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2013-04-26 10:02:06 UTC (rev 12308)
+++ trunk/src/CMakeLists.txt 2013-04-26 22:43:53 UTC (rev 12309)
@@ -215,10 +215,70 @@
# Transform "${libplplot${LIB_TAG}_LINK_LIBRARIES}" string to the
# standard pkg-config form.
-pkg_config_link_flags(
- libplplot${LIB_TAG}_LINK_FLAGS
- "${libplplot${LIB_TAG}_LINK_LIBRARIES}"
+
+set(libstdcxx_full_path)
+if(NOT BUILD_SHARED_LIBS)
+ # For this special case where the plplot library is a static C++
+ # library, pkg-config needs to add -L and -l options corresponding
+ # to libstd++.so to the link flags it delivers. Another alternative
+ # is to have the plplot library link statically to libstd++.a, but
+ # static linking is not well-supported in CMake, and I am attempting
+ # to keep this fix limited to just the configuration of the
+ # plplotd.pc pkg-config file. N.B. the logic below for finding the
+ # C++ library is extremely specific to GNU g++ (either Unix or MinGW
+ # version), but it is good to get at least this compiler to work for
+ # the special case of a static C++ plplot library.
+ if(EXISTS "${CMAKE_CXX_COMPILER}")
+ execute_process(
+ COMMAND ${CMAKE_CXX_COMPILER} --verbose --version
+ RESULT_VARIABLE CXX_rc
+ ERROR_VARIABLE CXX_string
+ ERROR_STRIP_TRAILING_WHITESPACE
+ OUTPUT_QUIET
+ )
+ else(EXISTS "${CMAKE_CXX_COMPILER}")
+ set(CXX_rc 2)
+ endif(EXISTS "${CMAKE_CXX_COMPILER}")
+ if(CXX_rc STREQUAL "0" AND CXX_string MATCHES "LIBRARY_PATH=")
+ string(REGEX REPLACE "^.*(LIBRARY_PATH=.*)\nCOLLECT_GCC_OPTIONS.*$" "\\1"
+ CXX_library_path_string ${CXX_string}
+ )
+ #message(STATUS "CXX_library_path_string = ${CXX_library_path_string}")
+ if(CXX_library_path_string MATCHES "^LIBRARY_PATH=")
+ string(REGEX REPLACE "^LIBRARY_PATH=" "" CXX_library_path ${CXX_library_path_string})
+ # This converts native path delimiters to a semicolon-delimited
+ #(cmake) list of directories.
+ file(TO_CMAKE_PATH ${CXX_library_path} CXX_library_path)
+ message(STATUS "CXX_library_path = ${CXX_library_path}")
+ find_library(libstdcxx_full_path NAMES stdc++ PATHS ${CXX_library_path})
+ message(STATUS "libstdcxx_full_path = ${libstdcxx_full_path}")
+ else(CXX_library_path_string MATCHES "^LIBRARY_PATH=")
+ message(STATUS "WARNING: execute_process failed to obtain C++ library needed for pkg-config")
+ message(STATUS "CXX_string = ${CXX_string}")
+ message(STATUS "CXX_library_path_string = ${CXX_library_path_string}")
+ endif(CXX_library_path_string MATCHES "^LIBRARY_PATH=")
+ else(CXX_rc STREQUAL "0" AND CXX_string MATCHES "LIBRARY_PATH=")
+ message(STATUS "WARNING: execute_process failed to obtain C++ library needed for pkg-config")
+ message(STATUS "CMAKE_CXX_COMPILER = ${CMAKE_CXX_COMPILER}")
+ message(STATUS "CXX_rc = ${CXX_rc}")
+ message(STATUS "CXX_string = ${CXX_string}")
+ endif(CXX_rc STREQUAL "0" AND CXX_string MATCHES "LIBRARY_PATH=")
+ if(NOT libstdcxx_full_path)
+ message(STATUS "WARNING: failed to find viable C++ compiler library so pkg-config link flags will be incomplete")
+ endif(NOT libstdcxx_full_path)
+endif(NOT BUILD_SHARED_LIBS)
+
+if(libstdcxx_full_path)
+ pkg_config_link_flags(
+ libplplot${LIB_TAG}_LINK_FLAGS
+ "${libplplot${LIB_TAG}_LINK_LIBRARIES};${libstdcxx_full_path}"
)
+else(libstdcxx_full_path)
+ pkg_config_link_flags(
+ libplplot${LIB_TAG}_LINK_FLAGS
+ "${libplplot${LIB_TAG}_LINK_LIBRARIES}"
+ )
+endif(libstdcxx_full_path)
if(WITH_CSA)
set(
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2014-03-14 04:24:24
|
Revision: 13054
http://sourceforge.net/p/plplot/code/13054
Author: airwin
Date: 2014-03-14 04:24:20 +0000 (Fri, 14 Mar 2014)
Log Message:
-----------
Straighten out some endif inconsistencies introduced by the last commit that had no consequences
other than a warning message.
Modified Paths:
--------------
trunk/src/CMakeLists.txt
Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt 2014-03-13 23:01:25 UTC (rev 13053)
+++ trunk/src/CMakeLists.txt 2014-03-14 04:24:20 UTC (rev 13054)
@@ -216,8 +216,8 @@
if(ANY_QT_DEVICE AND NOT PLPLOT_USE_QT5)
# Update the target COMPILE_DEFINITIONS and INCLUDE_DIRECTORIES
set_qt_target_properties(plplot${LIB_TAG})
- endif(ANY_QT_DEVICE)
-endif(ENABLE_DYNDRIVERS AND NOT PLPLOT_USE_QT5)
+ endif(ANY_QT_DEVICE AND NOT PLPLOT_USE_QT5)
+endif(ENABLE_DYNDRIVERS)
#message("DEBUG: LIB_INSTALL_RPATH = ${LIB_INSTALL_RPATH}")
if(MATH_LIB)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X