Revision: 44874
http://brlcad.svn.sourceforge.net/brlcad/?rev=44874&view=rev
Author: kunigami
Date: 2011-06-09 16:23:47 +0000 (Thu, 09 Jun 2011)
Log Message:
-----------
Modified CMakeLists. Libraries paths are not hard-coded anymore
Modified Paths:
--------------
brlcad/trunk/src/liboptical/CMakeLists.txt
Modified: brlcad/trunk/src/liboptical/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/liboptical/CMakeLists.txt 2011-06-09 14:41:53 UTC (rev
44873)
+++ brlcad/trunk/src/liboptical/CMakeLists.txt 2011-06-09 16:23:47 UTC (rev
44874)
@@ -69,18 +69,34 @@
message("Oslcomp: ${OSLCOMP_LIBRARY}")
message("Oslquery: ${OSLQUERY_LIBRARY}")
- set (OSLRT_SOURCES osl-renderer.cpp)
+
+ set (OSLRT_SOURCES osl-renderer.cpp render_svc.cpp)
+
#set (OSLRT_LIBS ${OSLEXEC_LIBRARY} ${OSLCOMP_LIBRARY} ${OSLQUERY_LIBRARY}
${OPENIMAGEIO_LIBRARY} ${Boost_LIBRARIES})
-
message("OSLRT_SOURCES: ${OSLRT_SOURCES}")
- message("OSLRT_LIBRARIES: ${OSLRT_LIBS}")
+ #find_package(Boost)
- # BRLCAD_ADDLIB(osl-renderer "${OSLRT_SOURCES}" "${OSLRT_LIBS}")
+ # Try to find BOOST
+ set (Boost_COMPONENTS filesystem regex system thread)
+ find_package (Boost 1.46 REQUIRED
+ COMPONENTS ${Boost_COMPONENTS})
+ # If it was not found, check if BOOST_ROOT was set
+ IF(NOT Boost_FILESYSTEM_LIBRARY)
+ message("Cheking if BOOST ROOT was FOUND")
+ ENDIF()
- BRLCAD_ADDLIB(osl-renderer "${OSLRT_SOURCES}"
"/Users/kunigami/dev/osl/dist/macosx/lib/liboslexec.dylib
/Users/kunigami/dev/osl/dist/macosx/lib/liboslcomp.dylib
/Users/kunigami/dev/osl/dist/macosx/lib/liboslquery.dylib
/Users/kunigami/dev/oiio/dist/macosx/lib/libOpenImageIO.dylib
/opt/local/lib/libboost_filesystem-mt.dylib
/opt/local/lib/libboost_regex-mt.dylib /opt/local/lib/libboost_system-mt.dylib
/opt/local/lib/libboost_thread-mt.dylib")
+ message("Boost filesystem: ${Boost_FILESYSTEM_LIBRARY}")
+ message("Boost regex: ${Boost_REGEX_LIBRARY}")
+ message("Boost system: ${Boost_SYSTEM_LIBRARY}")
+ message("Boost thread: ${Boost_THREAD_LIBRARY}")
- #BRLCAD_ADDLIB(osl-renderer "${OSLRT_SOURCES}"
"/Users/kunigami/dev/osl/dist/macosx/lib/liboslexec.dylib;/Users/kunigami/dev/osl/dist/macosx/lib/liboslcomp.dylib;/Users/kunigami/dev/osl/dist/macosx/lib/liboslquery.dylib;/Users/kunigami/dev/oiio/dist/macosx/lib/libOpenImageIO.dylib;/opt/local/lib/libboost_filesystem-mt.dylib;/opt/local/lib/libboost_regex-mt.dylib;/opt/local/lib/libboost_system-mt.dylib;/opt/local/lib/libboost_thread-mt.dylib")
+ set(OSLRT_LIBS "${OSLEXEC_LIBRARY} ${OSLCOMP_LIBRARY} ${OSLQUERY_LIBRARY}
${OPENIMAGEIO_LIBRARY} ${Boost_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY}
${Boost_REGEX_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_THREAD_LIBRARY}")
+
+ STRING(REGEX REPLACE ";" " " OSLRT_LIBS2 "${OSLRT_LIBS}")
+ message("novas bibliotecas: ${OSLRT_LIBS2}")
+ BRLCAD_ADDLIB(osl-renderer "${OSLRT_SOURCES}" "${OSLRT_LIBS2}")
+
##########################################
# OSL Shader
##########################################
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
EditLive Enterprise is the world's most technically advanced content
authoring tool. Experience the power of Track Changes, Inline Image
Editing and ensure content is compliant with Accessibility Checking.
http://p.sf.net/sfu/ephox-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
