Update of /cvsroot/octaviz/octaviz/Common
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv23335/Common
Modified Files:
CMakeLists.txt
Log Message:
edits for Mac OS X
Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/octaviz/octaviz/Common/CMakeLists.txt,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- CMakeLists.txt 22 Dec 2007 22:03:54 -0000 1.12
+++ CMakeLists.txt 11 Jan 2008 15:10:22 -0000 1.13
@@ -1,12 +1,12 @@
+INCLUDE_DIRECTORIES(${OCTINCLUDEDIR} "${OCTINCLUDEDIR}/octave" )
+LINK_LIBRARIES(octinterp octave cruft vtkCommon)
+LINK_DIRECTORIES(${OCTLIBDIR})
+
ADD_LIBRARY( octaviz SHARED octaviz.cc )
OCTAVE_WRAP_VTK(Common)
# This sets INCLUDE_FLAGS and LINK_FLAGS also for the .cc files below
-INCLUDE_DIRECTORIES(${OCTINCLUDEDIR} "${OCTINCLUDEDIR}/octave" )
-LINK_LIBRARIES(octinterp octave cruft vtkCommon)
-LINK_DIRECTORIES(${OCTLIBDIR})
-
SET (common_octs)
# track the .oct files for shorter DEPENDS lines
@@ -29,7 +29,7 @@
COMMAND ${MKOCTFILE}
ARGS --verbose ${WNODEPRECATED} ${INCLUDE_FLAGS} -I${CMAKE_CURRENT_SOURCE_DIR}
${LINK_FLAGS} ${APPLE_FLAG}
- -Wl,-rpath=${OCTAVIZ_RPATH}
+ #-Wl,-rpath=${OCTAVIZ_RPATH}
--output ${CMAKE_CURRENT_BINARY_DIR}/${class}.oct
${CMAKE_CURRENT_BINARY_DIR}/${class}.cc
DEPENDS octaviz
|
