|
From: <ai...@us...> - 2009-08-25 17:49:18
|
Revision: 10332
http://plplot.svn.sourceforge.net/plplot/?rev=10332&view=rev
Author: airwin
Date: 2009-08-25 17:49:12 +0000 (Tue, 25 Aug 2009)
Log Message:
-----------
Whitespace.
export plplot_octave target.
Modified Paths:
--------------
trunk/bindings/octave/CMakeLists.txt
Modified: trunk/bindings/octave/CMakeLists.txt
===================================================================
--- trunk/bindings/octave/CMakeLists.txt 2009-08-25 17:47:25 UTC (rev 10331)
+++ trunk/bindings/octave/CMakeLists.txt 2009-08-25 17:49:12 UTC (rev 10332)
@@ -22,238 +22,239 @@
# Build and install octave interface to PLplot and octave PLplot examples.
if(ENABLE_octave)
-add_subdirectory(PLplot)
-add_subdirectory(misc)
+ add_subdirectory(PLplot)
+ add_subdirectory(misc)
-# Install renamed documentation files.
-set(docfiles
-BUGS
-FGA
-INSTALL
-README
-ToDo
-USAGE
-)
-foreach(doc ${docfiles})
- install(FILES ${doc} DESTINATION ${DOC_DIR} RENAME ${doc}.octave)
-endforeach(doc ${docfiles})
+ # Install renamed documentation files.
+ set(docfiles
+ BUGS
+ FGA
+ INSTALL
+ README
+ ToDo
+ USAGE
+ )
+ foreach(doc ${docfiles})
+ install(FILES ${doc} DESTINATION ${DOC_DIR} RENAME ${doc}.octave)
+ endforeach(doc ${docfiles})
-# This is a representative generated (or prebuilt) octave documentation file.
-# There are more than a hundred of these *.txt files. If the (unlikely)
-# event that the plinit command is no longer part of the PLplot API, this
-# representative file would have to be changed.
-set(rep_doc plinit.txt)
+ # This is a representative generated (or prebuilt) octave documentation file.
+ # There are more than a hundred of these *.txt files. If the (unlikely)
+ # event that the plinit command is no longer part of the PLplot API, this
+ # representative file would have to be changed.
+ set(rep_doc plinit.txt)
-if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_txt/${rep_doc})
- # Octave documentation has been prebuilt in the (tarball) source tree.
- # Copy it to the build tree if that tree is different from source tree.
- if(NOT CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
+ if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_txt/${rep_doc})
+ # Octave documentation has been prebuilt in the (tarball) source tree.
+ # Copy it to the build tree if that tree is different from source tree.
+ if(NOT CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
+ COMMAND ${CMAKE_COMMAND} -E copy_directory
+ ${CMAKE_SOURCE_DIR}/bindings/octave/plplot_octave_txt
+ ${CMAKE_BINARY_DIR}/bindings/octave/plplot_octave_txt
+ )
+ endif(NOT CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
+ add_custom_target(
+ make_documentation ALL
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
+ )
+ else(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_txt/${rep_doc})
+ # Generate full on-line help for plplot_octave
+ file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt)
add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
- COMMAND ${CMAKE_COMMAND} -E copy_directory
- ${CMAKE_SOURCE_DIR}/bindings/octave/plplot_octave_txt
- ${CMAKE_BINARY_DIR}/bindings/octave/plplot_octave_txt
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/plplot.doc
+ COMMAND ${CMAKE_COMMAND} -E copy
+ ${CMAKE_CURRENT_SOURCE_DIR}/etc/plplot.doc
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/plplot.doc
+ DEPENDS
+ ${CMAKE_CURRENT_SOURCE_DIR}/etc/plplot.doc
+ )
+ if(PERL_XML_DOM AND PERL_XML_PARSER)
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
+ COMMAND ${PERL_EXECUTABLE}
+ ${CMAKE_SOURCE_DIR}/doc/docbook/bin/api2text.pl
+ ${CMAKE_SOURCE_DIR}/doc/docbook/src/plplotdoc.xml.in
+ ${CMAKE_SOURCE_DIR}/doc/docbook/src/api.xml
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/plplot.doc
+ ${CMAKE_SOURCE_DIR}/doc/docbook/bin/api2text.pl
+ ${CMAKE_SOURCE_DIR}/doc/docbook/src/plplotdoc.xml.in
+ ${CMAKE_SOURCE_DIR}/doc/docbook/src/api.xml
+ WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt
+ )
+
+ add_custom_target(
+ make_documentation ALL
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
+ )
+ else(PERL_XML_DOM AND PERL_XML_PARSER)
+ message(STATUS
+ "WARNING: Perl modules XML::Parser and/or XML::DOM not available\n"
+ " so cannot generate full online help for plplot_octave"
+ )
+ add_custom_target(
+ make_documentation ALL
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/plplot.doc
+ )
+ endif(PERL_XML_DOM AND PERL_XML_PARSER)
+ endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_txt/${rep_doc})
+
+ # Generate source code for octave interface to PLplot.
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave.h.in
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h
+ @ONLY
)
- endif(NOT CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
- add_custom_target(
- make_documentation ALL
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
- )
-else(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_txt/${rep_doc})
- # Generate full on-line help for plplot_octave
- file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt)
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/octave_version.pl.in
+ ${CMAKE_CURRENT_BINARY_DIR}/octave_version.pl
+ @ONLY
+ )
+ configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/octaverc.in
+ ${CMAKE_CURRENT_BINARY_DIR}/.octaverc
+ @ONLY
+ )
add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/plplot.doc
- COMMAND ${CMAKE_COMMAND} -E copy
- ${CMAKE_CURRENT_SOURCE_DIR}/etc/plplot.doc
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/plplot.doc
- DEPENDS
- ${CMAKE_CURRENT_SOURCE_DIR}/etc/plplot.doc
- )
- if(PERL_XML_DOM AND PERL_XML_PARSER)
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
+ OUTPUT
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
+ ${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
COMMAND ${PERL_EXECUTABLE}
- ${CMAKE_SOURCE_DIR}/doc/docbook/bin/api2text.pl
- ${CMAKE_SOURCE_DIR}/doc/docbook/src/plplotdoc.xml.in
- ${CMAKE_SOURCE_DIR}/doc/docbook/src/api.xml
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/plplot.doc
- ${CMAKE_SOURCE_DIR}/doc/docbook/bin/api2text.pl
- ${CMAKE_SOURCE_DIR}/doc/docbook/src/plplotdoc.xml.in
- ${CMAKE_SOURCE_DIR}/doc/docbook/src/api.xml
- WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt
+ -I${MATWRAP_PATH} ${MATWRAP}
+ -language octave -o plplot_octave.cc -stub tmp_stub
+ -cpp_ignore ${CMAKE_CURRENT_SOURCE_DIR}
+ -cpp_ignore ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_rej.h
+ -cpp ${CMAKE_C_COMPILER} -D__builtin_va_list=void -E
+ -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_CURRENT_BINARY_DIR} -C plplot_octave.h
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h
)
-
- add_custom_target(
- make_documentation ALL
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
+
+ # Build octave interface.
+ set(octave_interface_INCLUDE_PATHS
+ ${CMAKE_SOURCE_DIR}/include
+ ${CMAKE_BINARY_DIR}
+ ${CMAKE_BINARY_DIR}/include
+ ${CMAKE_CURRENT_SOURCE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${OCTAVE_INCLUDE_PATH}
)
- else(PERL_XML_DOM AND PERL_XML_PARSER)
- message(STATUS
- "WARNING: Perl modules XML::Parser and/or XML::DOM not available\n"
- " so cannot generate full online help for plplot_octave"
+ include_directories(${octave_interface_INCLUDE_PATHS})
+
+ add_library(plplot_octave MODULE ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc)
+ target_link_libraries(
+ plplot_octave
+ plplot${LIB_TAG}
+ "${OCTAVE_LIBRARIES}"
+ "${OCTINTERP_LIBRARIES}"
)
- add_custom_target(
- make_documentation ALL
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/plplot.doc
- )
- endif(PERL_XML_DOM AND PERL_XML_PARSER)
-endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_txt/${rep_doc})
-# Generate source code for octave interface to PLplot.
-configure_file(
-${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave.h.in
-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h
-@ONLY
-)
-configure_file(
-${CMAKE_CURRENT_SOURCE_DIR}/octave_version.pl.in
-${CMAKE_CURRENT_BINARY_DIR}/octave_version.pl
-@ONLY
-)
-configure_file(
-${CMAKE_CURRENT_SOURCE_DIR}/octaverc.in
-${CMAKE_CURRENT_BINARY_DIR}/.octaverc
-@ONLY
-)
-add_custom_command(
-OUTPUT
-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
-${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
-COMMAND ${PERL_EXECUTABLE}
--I${MATWRAP_PATH} ${MATWRAP}
--language octave -o plplot_octave.cc -stub tmp_stub
--cpp_ignore ${CMAKE_CURRENT_SOURCE_DIR}
--cpp_ignore ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_rej.h
--cpp ${CMAKE_C_COMPILER} -D__builtin_va_list=void -E
--I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_CURRENT_BINARY_DIR} -C plplot_octave.h
-DEPENDS
-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h
-)
+ if(USE_RPATH)
+ get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
+ # (Reasonable) assumption here is that OCTAVE_LIBRARIES and
+ # OCTINTERP_LIBRARIES have the same path.
+ get_filename_component(OCTAVE_INSTALL_RPATH "${OCTAVE_LIBRARIES}" PATH)
+ set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${OCTAVE_INSTALL_RPATH})
+ set_target_properties(
+ plplot_octave
+ PROPERTIES
+ PREFIX ""
+ SUFFIX ".oct"
+ INSTALL_RPATH "${LIB_INSTALL_RPATH}"
+ INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}"
+ )
+ else(USE_RPATH)
+ set_target_properties(
+ plplot_octave
+ PROPERTIES
+ PREFIX ""
+ SUFFIX ".oct"
+ INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}"
+ )
+ endif(USE_RPATH)
-# Build octave interface.
-set(octave_interface_INCLUDE_PATHS
-${CMAKE_SOURCE_DIR}/include
-${CMAKE_BINARY_DIR}
-${CMAKE_BINARY_DIR}/include
-${CMAKE_CURRENT_SOURCE_DIR}
-${CMAKE_CURRENT_BINARY_DIR}
-${OCTAVE_INCLUDE_PATH}
-)
-include_directories(${octave_interface_INCLUDE_PATHS})
+ # Have to be specific about permissions for some reason (probably oct suffix).
+ set(PERM_MODULES
+ OWNER_READ
+ OWNER_WRITE
+ OWNER_EXECUTE
+ GROUP_READ
+ GROUP_EXECUTE
+ WORLD_READ
+ WORLD_EXECUTE
+ )
-add_library(plplot_octave MODULE ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc)
-target_link_libraries(
-plplot_octave
-plplot${LIB_TAG}
-"${OCTAVE_LIBRARIES}"
-"${OCTINTERP_LIBRARIES}"
-)
+ install(TARGETS plplot_octave
+ EXPORT export_plplot
+ LIBRARY
+ DESTINATION ${OCTAVE_OCT_DIR}
+ PERMISSIONS ${PERM_MODULES}
+ )
-if(USE_RPATH)
- get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
- # (Reasonable) assumption here is that OCTAVE_LIBRARIES and
- # OCTINTERP_LIBRARIES have the same path.
- get_filename_component(OCTAVE_INSTALL_RPATH "${OCTAVE_LIBRARIES}" PATH)
- set(LIB_INSTALL_RPATH ${LIB_INSTALL_RPATH} ${OCTAVE_INSTALL_RPATH})
- set_target_properties(
- plplot_octave
- PROPERTIES
- PREFIX ""
- SUFFIX ".oct"
- INSTALL_RPATH "${LIB_INSTALL_RPATH}"
- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}"
- )
-else(USE_RPATH)
- set_target_properties(
- plplot_octave
- PROPERTIES
- PREFIX ""
- SUFFIX ".oct"
- INSTALL_NAME_DIR "${OCTAVE_OCT_DIR}"
- )
-endif(USE_RPATH)
+ install(EXPORT export_plplot DESTINATION ${DATA_DIR}/examples/cmake/modules)
-# Have to be specific about permissions for some reason (probably oct suffix).
-set(PERM_MODULES
-OWNER_READ
-OWNER_WRITE
-OWNER_EXECUTE
-GROUP_READ
-GROUP_EXECUTE
-WORLD_READ
-WORLD_EXECUTE
-)
+ # Build and install plplot_stub.m
+ add_executable(massage massage.c)
+ get_target_property(
+ massage_LOCATION
+ massage
+ LOCATION
+ )
-install(
-TARGETS
-plplot_octave
-LIBRARY
-DESTINATION ${OCTAVE_OCT_DIR}
-PERMISSIONS ${PERM_MODULES}
-)
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m_part2
+ "# It was also massaged to add online documentation\n"
+ "# extracted from some PLplot distribution files\n"
+ "\n"
+ "1;\n"
+ "\n"
+ )
+ add_custom_command(
+ OUTPUT
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
+ ${CMAKE_CURRENT_BINARY_DIR}/missing_help
+ COMMAND head -5 tmp_stub > plplot_stub.m
+ COMMAND
+ cat plplot_stub.m_part2 >> plplot_stub.m
+ COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def >> plplot_stub.m
+ COMMAND echo >> plplot_stub.m
+ COMMAND
+ ${massage_LOCATION} >> plplot_stub.m 2> missing_help
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
+ ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def
+ ${massage_LOCATION}
+ )
-# Build and install plplot_stub.m
-add_executable(massage massage.c)
-get_target_property(
-massage_LOCATION
-massage
-LOCATION
-)
+ add_custom_target(
+ plplot_stub.m_built ALL
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
+ )
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m_part2
-"# It was also massaged to add online documentation\n"
-"# extracted from some PLplot distribution files\n"
-"\n"
-"1;\n"
-"\n"
-)
-add_custom_command(
-OUTPUT
-${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
-${CMAKE_CURRENT_BINARY_DIR}/missing_help
-COMMAND head -5 tmp_stub > plplot_stub.m
-COMMAND
-cat plplot_stub.m_part2 >> plplot_stub.m
-COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def >> plplot_stub.m
-COMMAND echo >> plplot_stub.m
-COMMAND
-${massage_LOCATION} >> plplot_stub.m 2> missing_help
-DEPENDS
-${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
-${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def
-${massage_LOCATION}
-)
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
+ DESTINATION ${PLPLOT_OCTAVE_DIR}
+ )
-add_custom_target(
-plplot_stub.m_built ALL
-DEPENDS
-${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
-)
+ if(never)
+ add_custom_command(
+ OUTPUT
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o
+ COMMAND
+ touch
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
+ )
-install(FILES
-${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
-DESTINATION ${PLPLOT_OCTAVE_DIR}
-)
-
-if(never)
-add_custom_command(
-OUTPUT
-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o
-COMMAND
-touch
-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o
-DEPENDS
-${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
-)
-
-# Link octave interface.
-add_custom_target(
-plplot_octave-libdir.oct ALL
-DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o
-)
-endif(never)
+ # Link octave interface.
+ add_custom_target(
+ plplot_octave-libdir.oct ALL
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o
+ )
+ endif(never)
endif(ENABLE_octave)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-08-25 18:57:14
|
Revision: 10333
http://plplot.svn.sourceforge.net/plplot/?rev=10333&view=rev
Author: airwin
Date: 2009-08-25 18:57:04 +0000 (Tue, 25 Aug 2009)
Log Message:
-----------
Sort out some residual dependency issues.
Modified Paths:
--------------
trunk/bindings/octave/CMakeLists.txt
Modified: trunk/bindings/octave/CMakeLists.txt
===================================================================
--- trunk/bindings/octave/CMakeLists.txt 2009-08-25 17:49:12 UTC (rev 10332)
+++ trunk/bindings/octave/CMakeLists.txt 2009-08-25 18:57:04 UTC (rev 10333)
@@ -55,9 +55,8 @@
${CMAKE_BINARY_DIR}/bindings/octave/plplot_octave_txt
)
endif(NOT CMAKE_BINARY_DIR STREQUAL "${CMAKE_SOURCE_DIR}")
- add_custom_target(
- make_documentation ALL
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
+ set(make_documentation_DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
)
else(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_txt/${rep_doc})
# Generate full on-line help for plplot_octave
@@ -85,22 +84,25 @@
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt
)
- add_custom_target(
- make_documentation ALL
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
+ set(make_documentation_DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/${rep_doc}
)
else(PERL_XML_DOM AND PERL_XML_PARSER)
message(STATUS
"WARNING: Perl modules XML::Parser and/or XML::DOM not available\n"
" so cannot generate full online help for plplot_octave"
)
- add_custom_target(
- make_documentation ALL
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/plplot.doc
+ set(make_documentation_DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_txt/plplot.doc
)
endif(PERL_XML_DOM AND PERL_XML_PARSER)
endif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_txt/${rep_doc})
+ add_custom_target(
+ make_documentation ALL
+ DEPENDS ${make_documentation_DEPENDS}
+ )
+
# Generate source code for octave interface to PLplot.
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave.h.in
@@ -225,6 +227,7 @@
${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def
${massage_LOCATION}
+ ${make_documentation_DEPENDS}
)
add_custom_target(
@@ -232,6 +235,9 @@
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
)
+ # Both these targets file depend on ${make_documentation_DEPENDS}
+ # so must serialize for parallel builds.
+ add_dependencies(plplot_stub.m_built make_documentation)
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-08-26 00:42:20
|
Revision: 10341
http://plplot.svn.sourceforge.net/plplot/?rev=10341&view=rev
Author: airwin
Date: 2009-08-26 00:42:08 +0000 (Wed, 26 Aug 2009)
Log Message:
-----------
Eliminate code that was never executed.
install(EXPORT export_plplot ... only needs to be executed once in whole
build tree. Do that in src/CMakeLists.txt.
Modified Paths:
--------------
trunk/bindings/octave/CMakeLists.txt
Modified: trunk/bindings/octave/CMakeLists.txt
===================================================================
--- trunk/bindings/octave/CMakeLists.txt 2009-08-25 22:29:52 UTC (rev 10340)
+++ trunk/bindings/octave/CMakeLists.txt 2009-08-26 00:42:08 UTC (rev 10341)
@@ -195,8 +195,6 @@
PERMISSIONS ${PERM_MODULES}
)
- install(EXPORT export_plplot DESTINATION ${DATA_DIR}/examples/cmake/modules)
-
# Build and install plplot_stub.m
add_executable(massage massage.c)
get_target_property(
@@ -243,24 +241,4 @@
${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
DESTINATION ${PLPLOT_OCTAVE_DIR}
)
-
- if(never)
- add_custom_command(
- OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o
- COMMAND
- touch
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.oct
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
- )
-
- # Link octave interface.
- add_custom_target(
- plplot_octave-libdir.oct ALL
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.o
- )
- endif(never)
endif(ENABLE_octave)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2009-09-18 17:25:03
|
Revision: 10422
http://plplot.svn.sourceforge.net/plplot/?rev=10422&view=rev
Author: airwin
Date: 2009-09-18 17:24:44 +0000 (Fri, 18 Sep 2009)
Log Message:
-----------
Create a global file-depends that is associated with the custom
target, plplot_stub.m_built.
Modified Paths:
--------------
trunk/bindings/octave/CMakeLists.txt
Modified: trunk/bindings/octave/CMakeLists.txt
===================================================================
--- trunk/bindings/octave/CMakeLists.txt 2009-09-18 14:44:26 UTC (rev 10421)
+++ trunk/bindings/octave/CMakeLists.txt 2009-09-18 17:24:44 UTC (rev 10422)
@@ -101,9 +101,9 @@
add_custom_target(
make_documentation ALL
DEPENDS ${make_documentation_DEPENDS}
- )
+ )
- # Generate source code for octave interface to PLplot.
+ # Configure source code for octave interface to PLplot.
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave.h.in
${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h
@@ -133,6 +133,8 @@
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h
)
+ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
+ PROPERTIES GENERATED ON)
# Build octave interface.
set(octave_interface_INCLUDE_PATHS
@@ -233,10 +235,20 @@
DEPENDS
${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
)
- # Both these targets file depend on ${make_documentation_DEPENDS}
- # so must serialize for parallel builds.
+
+ # Both these targets file-depend on custom commands which in turn
+ # file-depend on ${make_documentation_DEPENDS}. Therefore, must
+ # serialize these custom targets so that parallel build jobs
+ # don't interfere with each other.
add_dependencies(plplot_stub.m_built make_documentation)
+ # Need access elsewhere (examples/octave) to the file depends of
+ # this custom target.
+ set_property(GLOBAL PROPERTY
+ FILES_plplot_stub.m_built
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
+ )
+
install(FILES
${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
DESTINATION ${PLPLOT_OCTAVE_DIR}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-12-26 08:30:18
|
Revision: 11387
http://plplot.svn.sourceforge.net/plplot/?rev=11387&view=rev
Author: airwin
Date: 2010-12-26 08:30:11 +0000 (Sun, 26 Dec 2010)
Log Message:
-----------
For ENABLE_swig_octave case create tmp_stub_built target to create an
empty tmp_stub file and deal with dependencies for that situation.
This change allows a broken plplot_stub.m to be built as a temporary
measure for the ENABLE_swig_octave case.
Modified Paths:
--------------
trunk/bindings/octave/CMakeLists.txt
Modified: trunk/bindings/octave/CMakeLists.txt
===================================================================
--- trunk/bindings/octave/CMakeLists.txt 2010-12-26 08:26:49 UTC (rev 11386)
+++ trunk/bindings/octave/CMakeLists.txt 2010-12-26 08:30:11 UTC (rev 11387)
@@ -119,26 +119,17 @@
${CMAKE_CURRENT_BINARY_DIR}/.octaverc
@ONLY
)
- add_custom_command(
- OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
- ${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
- COMMAND ${PERL_EXECUTABLE}
- -I${MATWRAP_PATH} ${MATWRAP}
- -language octave -o plplot_octave.cc -stub tmp_stub
- -cpp_ignore ${CMAKE_CURRENT_SOURCE_DIR}
- -cpp_ignore ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_rej.h
- -cpp ${CMAKE_C_COMPILER} -D__builtin_va_list=void -E
- -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_CURRENT_BINARY_DIR} -C plplot_octave.h
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h
- )
- set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
- PROPERTIES GENERATED ON)
-
# Build octave interface.
- if( ENABLE_swig_octave)
+ if(ENABLE_swig_octave)
+ add_custom_command(
+ OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
+ COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
+ )
+ add_custom_target(tmp_stub_built
+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
+ )
+
set(octave_interface_INCLUDE_PATHS
${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/lib/qsastime
@@ -168,6 +159,8 @@
"${OCTAVE_LIBRARIES}"
"${OCTINTERP_LIBRARIES}"
)
+ add_dependencies(plplot_octave tmp_stub_built)
+
else(ENABLE_swig_octave)
set(octave_interface_INCLUDE_PATHS
${CMAKE_SOURCE_DIR}/include
@@ -179,6 +172,23 @@
)
include_directories(${octave_interface_INCLUDE_PATHS})
+ add_custom_command(
+ OUTPUT
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
+ ${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
+ COMMAND ${PERL_EXECUTABLE}
+ -I${MATWRAP_PATH} ${MATWRAP}
+ -language octave -o plplot_octave.cc -stub tmp_stub
+ -cpp_ignore ${CMAKE_CURRENT_SOURCE_DIR}
+ -cpp_ignore ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_rej.h
+ -cpp ${CMAKE_C_COMPILER} -D__builtin_va_list=void -E
+ -I${CMAKE_CURRENT_SOURCE_DIR} -I${CMAKE_CURRENT_BINARY_DIR} -C plplot_octave.h
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.h
+ )
+ set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc
+ PROPERTIES GENERATED ON)
+
add_library(plplot_octave MODULE ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave.cc)
target_link_libraries(
plplot_octave
@@ -186,7 +196,7 @@
"${OCTAVE_LIBRARIES}"
"${OCTINTERP_LIBRARIES}"
)
- endif( ENABLE_swig_octave)
+ endif(ENABLE_swig_octave)
if(USE_RPATH)
get_target_property(LIB_INSTALL_RPATH plplot${LIB_TAG} INSTALL_RPATH)
@@ -269,11 +279,16 @@
${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
)
- # Both these targets file-depend on custom commands which in turn
- # file-depend on ${make_documentation_DEPENDS}. Therefore, must
- # serialize these custom targets so that parallel build jobs
- # don't interfere with each other.
- add_dependencies(plplot_stub.m_built make_documentation)
+ if( ENABLE_swig_octave)
+ # These targets have common file depends.
+ add_dependencies(plplot_stub.m_built make_documentation tmp_stub_built)
+ else( ENABLE_swig_octave)
+ # Both these targets file-depend on custom commands which in turn
+ # file-depend on ${make_documentation_DEPENDS}. Therefore, must
+ # serialize these custom targets so that parallel build jobs
+ # don't interfere with each other.
+ add_dependencies(plplot_stub.m_built make_documentation)
+ endif( ENABLE_swig_octave)
# Need access elsewhere (examples/octave) to the file depends of
# this custom target.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-12-27 05:39:29
|
Revision: 11393
http://plplot.svn.sourceforge.net/plplot/?rev=11393&view=rev
Author: airwin
Date: 2010-12-27 05:39:23 +0000 (Mon, 27 Dec 2010)
Log Message:
-----------
Clean up the cmake logic so it does the minimal thing which is right
for the new experimental ENABLE_swig_octave=ON case.
Modified Paths:
--------------
trunk/bindings/octave/CMakeLists.txt
Modified: trunk/bindings/octave/CMakeLists.txt
===================================================================
--- trunk/bindings/octave/CMakeLists.txt 2010-12-27 05:36:44 UTC (rev 11392)
+++ trunk/bindings/octave/CMakeLists.txt 2010-12-27 05:39:23 UTC (rev 11393)
@@ -122,14 +122,6 @@
# Build octave interface.
if(ENABLE_swig_octave)
- add_custom_command(
- OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
- COMMAND ${CMAKE_COMMAND} -E touch ${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
- )
- add_custom_target(tmp_stub_built
- DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
- )
-
set(octave_interface_INCLUDE_PATHS
${CMAKE_SOURCE_DIR}/include
${CMAKE_SOURCE_DIR}/lib/qsastime
@@ -159,7 +151,6 @@
"${OCTAVE_LIBRARIES}"
"${OCTINTERP_LIBRARIES}"
)
- add_dependencies(plplot_octave tmp_stub_built)
else(ENABLE_swig_octave)
set(octave_interface_INCLUDE_PATHS
@@ -196,6 +187,64 @@
"${OCTAVE_LIBRARIES}"
"${OCTINTERP_LIBRARIES}"
)
+
+ # Build and install plplot_stub.m
+ add_executable(massage massage.c)
+ get_target_property(
+ massage_LOCATION
+ massage
+ LOCATION
+ )
+
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m_part2
+ "# It was also massaged to add online documentation\n"
+ "# extracted from some PLplot distribution files\n"
+ "\n"
+ "1;\n"
+ "\n"
+ )
+ add_custom_command(
+ OUTPUT
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
+ ${CMAKE_CURRENT_BINARY_DIR}/missing_help
+ COMMAND head -5 tmp_stub > plplot_stub.m
+ COMMAND
+ cat plplot_stub.m_part2 >> plplot_stub.m
+ COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def >> plplot_stub.m
+ COMMAND echo >> plplot_stub.m
+ COMMAND
+ ${massage_LOCATION} >> plplot_stub.m 2> missing_help
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
+ ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def
+ ${massage_LOCATION}
+ ${make_documentation_DEPENDS}
+ )
+
+ add_custom_target(
+ plplot_stub.m_built ALL
+ DEPENDS
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
+ )
+
+ # Both these targets file-depend on custom commands which in turn
+ # file-depend on ${make_documentation_DEPENDS}. Therefore, must
+ # serialize these custom targets so that parallel build jobs
+ # don't interfere with each other.
+ add_dependencies(plplot_stub.m_built make_documentation)
+
+ # Need access elsewhere (examples/octave) to the file depends of
+ # this custom target.
+ set_property(GLOBAL PROPERTY
+ FILES_plplot_stub.m_built
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
+ )
+
+ install(FILES
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
+ DESTINATION ${PLPLOT_OCTAVE_DIR}
+ )
+
endif(ENABLE_swig_octave)
if(USE_RPATH)
@@ -240,65 +289,4 @@
PERMISSIONS ${PERM_MODULES}
)
- # Build and install plplot_stub.m
- add_executable(massage massage.c)
- get_target_property(
- massage_LOCATION
- massage
- LOCATION
- )
-
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m_part2
- "# It was also massaged to add online documentation\n"
- "# extracted from some PLplot distribution files\n"
- "\n"
- "1;\n"
- "\n"
- )
- add_custom_command(
- OUTPUT
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
- ${CMAKE_CURRENT_BINARY_DIR}/missing_help
- COMMAND head -5 tmp_stub > plplot_stub.m
- COMMAND
- cat plplot_stub.m_part2 >> plplot_stub.m
- COMMAND cat ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def >> plplot_stub.m
- COMMAND echo >> plplot_stub.m
- COMMAND
- ${massage_LOCATION} >> plplot_stub.m 2> missing_help
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/tmp_stub
- ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def
- ${massage_LOCATION}
- ${make_documentation_DEPENDS}
- )
-
- add_custom_target(
- plplot_stub.m_built ALL
- DEPENDS
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
- )
-
- if( ENABLE_swig_octave)
- # These targets have common file depends.
- add_dependencies(plplot_stub.m_built make_documentation tmp_stub_built)
- else( ENABLE_swig_octave)
- # Both these targets file-depend on custom commands which in turn
- # file-depend on ${make_documentation_DEPENDS}. Therefore, must
- # serialize these custom targets so that parallel build jobs
- # don't interfere with each other.
- add_dependencies(plplot_stub.m_built make_documentation)
- endif( ENABLE_swig_octave)
-
- # Need access elsewhere (examples/octave) to the file depends of
- # this custom target.
- set_property(GLOBAL PROPERTY
- FILES_plplot_stub.m_built
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
- )
-
- install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
- DESTINATION ${PLPLOT_OCTAVE_DIR}
- )
endif(ENABLE_octave)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2010-12-29 00:10:57
|
Revision: 11395
http://plplot.svn.sourceforge.net/plplot/?rev=11395&view=rev
Author: airwin
Date: 2010-12-29 00:10:50 +0000 (Wed, 29 Dec 2010)
Log Message:
-----------
Important build system tweak for the for the ENABLE_swig_octave case.
Add necessary ${OCTAVE_INCLUDE_PATH} to the list of directories searched
for headers.
Modified Paths:
--------------
trunk/bindings/octave/CMakeLists.txt
Modified: trunk/bindings/octave/CMakeLists.txt
===================================================================
--- trunk/bindings/octave/CMakeLists.txt 2010-12-27 07:25:51 UTC (rev 11394)
+++ trunk/bindings/octave/CMakeLists.txt 2010-12-29 00:10:50 UTC (rev 11395)
@@ -128,6 +128,7 @@
${CMAKE_BINARY_DIR}
${CMAKE_BINARY_DIR}/include
${CMAKE_CURRENT_BINARY_DIR}
+ ${OCTAVE_INCLUDE_PATH}
${CMAKE_SOURCE_DIR}/bindings/swig-support
)
include_directories(${octave_interface_INCLUDE_PATHS})
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2011-01-08 17:02:00
|
Revision: 11455
http://plplot.svn.sourceforge.net/plplot/?rev=11455&view=rev
Author: airwin
Date: 2011-01-08 17:01:54 +0000 (Sat, 08 Jan 2011)
Log Message:
-----------
Use vastly updated global symbol results in
bindings/octave/plplot_octave_def to help generate plplot_stub.m for
the (default) ENABLE_swig_octave=ON case. This change means when the
global command for these symbols is used within functions (e.g.,
x33c.m), the correct PLplot values (taken here from plplot_octave_def,
but that was generated from the #defines in
bindings/swig-support/plplotcapi.i) will be used for these symbols.
Modified Paths:
--------------
trunk/bindings/octave/CMakeLists.txt
Modified: trunk/bindings/octave/CMakeLists.txt
===================================================================
--- trunk/bindings/octave/CMakeLists.txt 2011-01-08 16:38:26 UTC (rev 11454)
+++ trunk/bindings/octave/CMakeLists.txt 2011-01-08 17:01:54 UTC (rev 11455)
@@ -123,13 +123,17 @@
if(ENABLE_swig_octave)
+ # Order matters here; plplot_oct_def (which contains all the
+ # global commands must occur first.
add_custom_command(
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
- COMMAND ${CMAKE_COMMAND} -E copy_if_different
+ COMMAND cat
+ ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def
${CMAKE_CURRENT_SOURCE_DIR}/plplot_stub_hand_crafted.m
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
+ > ${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
DEPENDS
+ ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def
${CMAKE_CURRENT_SOURCE_DIR}/plplot_stub_hand_crafted.m
)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2011-01-09 18:51:59
|
Revision: 11457
http://plplot.svn.sourceforge.net/plplot/?rev=11457&view=rev
Author: airwin
Date: 2011-01-09 18:51:53 +0000 (Sun, 09 Jan 2011)
Log Message:
-----------
Implement (Unix) check_plplot_octave_def custom target which generates a check
version of plplot_octave_def from bindings/swig-support/plplotcapi.i and
compares those results with plplot_octave_def in the source tree.
Modified Paths:
--------------
trunk/bindings/octave/CMakeLists.txt
Modified: trunk/bindings/octave/CMakeLists.txt
===================================================================
--- trunk/bindings/octave/CMakeLists.txt 2011-01-08 17:09:05 UTC (rev 11456)
+++ trunk/bindings/octave/CMakeLists.txt 2011-01-09 18:51:53 UTC (rev 11457)
@@ -119,12 +119,28 @@
${CMAKE_CURRENT_BINARY_DIR}/.octaverc
@ONLY
)
+
+ # Add (Unix) custom target to check that plplot_oct_def is up to date.
+ add_custom_target(
+ check_plplot_octave_def
+ COMMAND ${CMAKE_COMMAND} -E remove -f
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_compare
+ COMMAND
+ sed -f ${CMAKE_CURRENT_SOURCE_DIR}/global_defines.sed <
+ ${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i >
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_compare
+ COMMAND
+ ${CMAKE_COMMAND} -E echo Check that plplot_octave_def is up to date.
+ COMMAND
+ cmp ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_compare
+ )
+
# Build octave interface.
-
if(ENABLE_swig_octave)
# Order matters here; plplot_oct_def (which contains all the
- # global commands must occur first.
+ # global commands) must occur first.
add_custom_command(
OUTPUT
${CMAKE_CURRENT_BINARY_DIR}/plplot_stub.m
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <and...@us...> - 2011-08-12 16:09:45
|
Revision: 11878
http://plplot.svn.sourceforge.net/plplot/?rev=11878&view=rev
Author: andrewross
Date: 2011-08-12 16:09:39 +0000 (Fri, 12 Aug 2011)
Log Message:
-----------
No need to set the executable bit for a .oct shared object.
Modified Paths:
--------------
trunk/bindings/octave/CMakeLists.txt
Modified: trunk/bindings/octave/CMakeLists.txt
===================================================================
--- trunk/bindings/octave/CMakeLists.txt 2011-08-12 13:47:11 UTC (rev 11877)
+++ trunk/bindings/octave/CMakeLists.txt 2011-08-12 16:09:39 UTC (rev 11878)
@@ -314,11 +314,8 @@
set(PERM_MODULES
OWNER_READ
OWNER_WRITE
- OWNER_EXECUTE
GROUP_READ
- GROUP_EXECUTE
WORLD_READ
- WORLD_EXECUTE
)
install(TARGETS plplot_octave
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ai...@us...> - 2013-09-28 17:52:25
|
Revision: 12544
http://sourceforge.net/p/plplot/code/12544
Author: airwin
Date: 2013-09-28 17:52:22 +0000 (Sat, 28 Sep 2013)
Log Message:
-----------
Only define the check_plplot_octave_def custom target when using the
matwrapped bindings (which should probably be removed in any case during the
next release cycle).
Modified Paths:
--------------
trunk/bindings/octave/CMakeLists.txt
Modified: trunk/bindings/octave/CMakeLists.txt
===================================================================
--- trunk/bindings/octave/CMakeLists.txt 2013-09-28 17:50:13 UTC (rev 12543)
+++ trunk/bindings/octave/CMakeLists.txt 2013-09-28 17:52:22 UTC (rev 12544)
@@ -120,26 +120,27 @@
@ONLY
)
- # Add (Unix) custom target to check that plplot_oct_def is up to date.
- # This check only relevant for legacy matwrapped octave bindings since
- # swig-based bindings don't use plplot_oct_def.
- add_custom_target(
- check_plplot_octave_def
- COMMAND ${CMAKE_COMMAND} -E remove -f
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_compare
- COMMAND
- sed -f ${CMAKE_CURRENT_SOURCE_DIR}/global_defines.sed <
- ${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i >
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_compare
- COMMAND
- ${CMAKE_COMMAND} -E echo Check that plplot_octave_def is up to date.
- COMMAND
- cmp ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def
- ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_compare
- )
-
# Build octave interface.
if(ENABLE_matwrapped_octave)
+
+ # Add (Unix) custom target to check that plplot_oct_def (used only
+ # when ENABLE_matwrapped_octave is ON) is consistent
+ # with swig-support/plplotcapi.i.
+ add_custom_target(
+ check_plplot_octave_def
+ COMMAND ${CMAKE_COMMAND} -E remove -f
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_compare
+ COMMAND
+ sed -f ${CMAKE_CURRENT_SOURCE_DIR}/global_defines.sed <
+ ${CMAKE_SOURCE_DIR}/bindings/swig-support/plplotcapi.i >
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_compare
+ COMMAND
+ ${CMAKE_COMMAND} -E echo "Check that plplot_octave_def is consistent with bindings/swig-support/plplotcapi.i"
+ COMMAND
+ cmp ${CMAKE_CURRENT_SOURCE_DIR}/plplot_octave_def
+ ${CMAKE_CURRENT_BINARY_DIR}/plplot_octave_compare
+ )
+
set(octave_interface_INCLUDE_PATHS
${CMAKE_SOURCE_DIR}/include
${CMAKE_BINARY_DIR}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|