[Plplot-cvs] SF.net SVN: plplot:[9434] trunk

[<ai...@us...>]

Revision: 9434
          http://plplot.svn.sourceforge.net/plplot/?rev=9434&view=rev
Author:   airwin
Date:     2009-02-02 20:26:52 +0000 (Mon, 02 Feb 2009)

Log Message:
-----------
Build-system updates for qsas time code.  These changes build and install
the qsastime library, makes libplplotd depend on this library (from
a build-system viewpoint although there are no calls in libplplotd to this
library, yet), and finally build an excutable in the build tree (but
not in the install tree) that tests the new qsastime library.

Modified Paths:
--------------
    trunk/cmake/modules/plplot_version.cmake
    trunk/drivers/CMakeLists.txt
    trunk/lib/CMakeLists.txt
    trunk/src/CMakeLists.txt

Added Paths:
-----------
    trunk/lib/qsastime/CMakeLists.txt

Modified: trunk/cmake/modules/plplot_version.cmake
===================================================================
--- trunk/cmake/modules/plplot_version.cmake	2009-02-02 20:21:40 UTC (rev 9433)
+++ trunk/cmake/modules/plplot_version.cmake	2009-02-02 20:26:52 UTC (rev 9434)
@@ -33,6 +33,9 @@
 set(csironn_SOVERSION 0)
 set(csironn_VERSION ${csironn_SOVERSION}.0.1)
 
+set(qsastime_SOVERSION 0)
+set(qsastime_VERSION ${qsastime_SOVERSION}.0.1)
+
 set(plplot_SOVERSION 9)
 set(plplot_VERSION ${plplot_SOVERSION}.6.1)
 

Modified: trunk/drivers/CMakeLists.txt
===================================================================
--- trunk/drivers/CMakeLists.txt	2009-02-02 20:21:40 UTC (rev 9433)
+++ trunk/drivers/CMakeLists.txt	2009-02-02 20:26:52 UTC (rev 9434)
@@ -46,6 +46,7 @@
   ${CMAKE_BINARY_DIR}/src
   ${CMAKE_BINARY_DIR}/lib/csa
   ${CMAKE_BINARY_DIR}/lib/nn
+  ${CMAKE_BINARY_DIR}/lib/qsastime
   ${libplplot${LIB_TAG}_RPATH}
   )
   

Modified: trunk/lib/CMakeLists.txt
===================================================================
--- trunk/lib/CMakeLists.txt	2009-02-02 20:21:40 UTC (rev 9433)
+++ trunk/lib/CMakeLists.txt	2009-02-02 20:26:52 UTC (rev 9434)
@@ -1,2 +1,3 @@
 add_subdirectory(csa)
 add_subdirectory(nn)
+add_subdirectory(qsastime)

Added: trunk/lib/qsastime/CMakeLists.txt
===================================================================
--- trunk/lib/qsastime/CMakeLists.txt	                        (rev 0)
+++ trunk/lib/qsastime/CMakeLists.txt	2009-02-02 20:26:52 UTC (rev 9434)
@@ -0,0 +1,53 @@
+# lib/qsastime/CMakeLists.txt for PLplot
+###
+### Process this file with cmake to produce Makefile
+###
+# Copyright (C) 2009 Alan W. Irwin
+#
+# This file is part of PLplot.
+#
+# PLplot is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Library General Public License as published
+# by the Free Software Foundation; version 2 of the License.
+#
+# PLplot is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Library General Public License for more details.
+#
+# You should have received a copy of the GNU Library General Public License
+# along with PLplot; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA
+
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  )
+
+set(qsastime_LIB_SRCS
+MJDtime.c
+MJDtime.h
+)
+
+if(BUILD_SHARED_LIBS)
+  SET_SOURCE_FILES_PROPERTIES( ${qsastime_LIB_SRCS}
+      PROPERTIES COMPILE_FLAGS "-DUSINGDLL"
+  )
+endif(BUILD_SHARED_LIBS)
+
+add_library(qsastime ${qsastime_LIB_SRCS})
+set_target_properties(
+qsastime
+PROPERTIES
+SOVERSION ${qsastime_SOVERSION}
+VERSION ${qsastime_VERSION}
+INSTALL_NAME_DIR "${LIB_DIR}"
+)
+
+install(TARGETS qsastime
+ARCHIVE DESTINATION ${LIB_DIR}
+LIBRARY DESTINATION ${LIB_DIR}
+RUNTIME DESTINATION ${BIN_DIR}
+)
+
+add_executable(test_qsastime MJDtime_test.c)
+target_link_libraries(test_qsastime qsastime)


Property changes on: trunk/lib/qsastime/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: trunk/src/CMakeLists.txt
===================================================================
--- trunk/src/CMakeLists.txt	2009-02-02 20:21:40 UTC (rev 9433)
+++ trunk/src/CMakeLists.txt	2009-02-02 20:26:52 UTC (rev 9434)
@@ -191,6 +191,16 @@
   )
 endif(HAVE_QHULL)
 
+set(
+  libplplot${LIB_TAG}_LINK_LIBRARIES
+  ${libplplot${LIB_TAG}_LINK_LIBRARIES}
+  qsastime
+  )
+set(
+  libplplot${LIB_TAG}_LINK_FLAGS
+  "${libplplot${LIB_TAG}_LINK_FLAGS} -lqsastime"
+  )
+
 if(WITH_FREETYPE)
   get_source_file_property(PLFREETYPE_COMPILE_PROPS plfreetype.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.