Revision: 40454
          http://brlcad.svn.sourceforge.net/brlcad/?rev=40454&view=rev
Author:   starseeker
Date:     2010-09-03 19:34:31 +0000 (Fri, 03 Sep 2010)

Log Message:
-----------
Add in intaval CMake logic

Modified Paths:
--------------
    brlcad/branches/cmake/src/conv/CMakeLists.txt
    brlcad/branches/cmake/src/conv/intaval/CMakeLists.txt

Modified: brlcad/branches/cmake/src/conv/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/conv/CMakeLists.txt       2010-09-03 19:28:56 UTC 
(rev 40453)
+++ brlcad/branches/cmake/src/conv/CMakeLists.txt       2010-09-03 19:34:31 UTC 
(rev 40454)
@@ -1,6 +1,6 @@
 ADD_SUBDIRECTORY(step)
 ADD_SUBDIRECTORY(iges)
-#ADD_SUBDIRECTORY(intaval)
+ADD_SUBDIRECTORY(intaval)
 
 include_directories(
        ${BRLCAD_BINARY_DIR}/include

Modified: brlcad/branches/cmake/src/conv/intaval/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/src/conv/intaval/CMakeLists.txt       2010-09-03 
19:28:56 UTC (rev 40453)
+++ brlcad/branches/cmake/src/conv/intaval/CMakeLists.txt       2010-09-03 
19:34:31 UTC (rev 40454)
@@ -1,17 +1,24 @@
 include_directories(
-    ../../../include
-    ../../other/libz
-    ../../other/openNURBS
-    ../../other/libregex
-    ../../other/tcl/generic
+       ${BRLCAD_BINARY_DIR}/include
+       ${BRLCAD_SOURCE_DIR}/include
+       ${BRLCAD_ZLIB_INCLUDE_DIR}
+       ${BRLCAD_OPENNURBS_INCLUDE_DIR}
+       ${BRLCAD_REGEX_INCLUDE_DIR}
+       ${TCL_INCLUDE_PATH}
 )
 
+IF(MSVC)
 add_definitions(
-    -DBRLCAD_DLL
     -DHAVE_CONFIG_H
     -DBRLCADBUILD
     -DON_DLL_IMPORTS
 )
+ELSE(MSVC)
+add_definitions(
+    -DHAVE_CONFIG_H
+    -DBRLCADBUILD
+)
+ENDIF(MSVC)
 
 add_executable(tgf-g
     read_dra.cpp
@@ -19,6 +26,5 @@
     tgf-g.cpp
     write_brl.cpp
 )
-target_link_libraries(tgf-g
-    BrlcadCore
-)
+target_link_libraries(tgf-g bu librt wdb)
+INSTALL(TARGETS tgf-g RUNTIME DESTINATION ${BRLCAD_INSTALL_BIN_DIR})


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
This SF.net Dev2Dev email is sponsored by:

Show off your parallel programming skills.
Enter the Intel(R) Threading Challenge 2010.
http://p.sf.net/sfu/intel-thread-sfd
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits

Reply via email to