Revision: 44860
http://brlcad.svn.sourceforge.net/brlcad/?rev=44860&view=rev
Author: kunigami
Date: 2011-06-09 11:30:12 +0000 (Thu, 09 Jun 2011)
Log Message:
-----------
Changed FindOSL so that it searches osl libraries from the OSLHOME environment
variable (the path was hard-coded before)
Modified Paths:
--------------
brlcad/trunk/misc/CMake/FindOSL.cmake
Modified: brlcad/trunk/misc/CMake/FindOSL.cmake
===================================================================
--- brlcad/trunk/misc/CMake/FindOSL.cmake 2011-06-09 08:54:46 UTC (rev
44859)
+++ brlcad/trunk/misc/CMake/FindOSL.cmake 2011-06-09 11:30:12 UTC (rev
44860)
@@ -10,27 +10,35 @@
# Find OSL
# ================================================
+# If 'OSL' not set, use the env variable of that name if available
+if (NOT OSLHOME)
+ if (NOT $ENV{OSLHOME} STREQUAL "")
+ set (OSLHOME $ENV{OSLHOME})
+ endif ()
+endif ()
+
+message("OSL_HOME = ${OSLHOME}")
+
# Find OSL library and its dependencies
FIND_LIBRARY(OSLEXEC_LIBRARY
NAMES liboslexec.dylib
- PATHS /Users/kunigami/dev/osl/dist/macosx/lib)
+ PATHS ${OSLHOME}/lib)
FIND_LIBRARY(OSLCOMP_LIBRARY
NAMES liboslcomp.dylib
- PATHS /Users/kunigami/dev/osl/dist/macosx/lib)
+ PATHS ${OSLHOME}/lib)
FIND_LIBRARY(OSLQUERY_LIBRARY
NAMES liboslquery.dylib
- PATHS /Users/kunigami/dev/osl/dist/macosx/lib)
+ PATHS ${OSLHOME}/lib)
FIND_PATH (OSL_INCLUDES
NAMES oslexec.h
- PATHS /Users/kunigami/dev/osl/dist/macosx/include/OSL)
+ PATHS ${OSLHOME}/include/OSL)
-# == Dependences ==
-
-
-if (OSL_LIBRARY AND OSL_INCLUDES)
+if (OSLEXEC_LIBRARY AND OSLCOMP_LIBRARY AND OSLQUERY_LIBRARY AND OSL_INCLUDES)
message("Found OSL")
- message("OSL LIBRARY = ${OSL_LIBRARY}")
+ message("OSL EXEC = ${OSLEXEC_LIBRARY}")
+ message("OSL COMP = ${OSLCOMP_LIBRARY}")
+ message("OSL QUERY = ${OSLQUERY_LIBRARY}")
message("OSL INCLUDES = ${OSL_INCLUDES}")
endif()
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
