Issue 1860044: build OSL on systems without LLVM

Keyboard Shortcuts

	File
u :	up to issue
m :	publish + mail comments
M :	edit review message
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line
<Enter> :	respond to / edit current comment
d :	mark current comment as done

	Issue
u :	up to list of issues
m :	publish + mail comments
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue
# :	close issue

	Comment/message editing
<Ctrl> + s or <Ctrl> + Enter :	save comment
<Esc> :	cancel edit

Issue 1860044: build OSL on systems without LLVM (Closed)

Can't Edit
Can't Publish+Mail
Start Review

Created:
13 years, 9 months ago by clifford.stein

Modified:
13 years, 3 months ago

Reviewers:

CC:
osl-dev_googlegroups.com, dev-osl_imageworks.com

Base URL:
http://openshadinglanguage.googlecode.com/svn/trunk/

Visibility:
Public.

Description

This fixes a minor bug so that OSL builds on systems without LLVM installed.

Patch Set 1 #

Created: 13 years, 9 months ago

Download [raw] [tar.bz2]

		Unified diffs	Side-by-side diffs	Delta from patch set	Stats (+4 lines, -1 line)			Patch
		src/liboslexec/CMakeLists.txt	View		1 chunk	+4 lines, -1 line	0 comments	Download

Messages

Total messages: 2

Expand All Messages | Collapse All Messages

lg_imageworks.com

13 years, 9 months ago (2010-07-23 21:43:10 UTC) #2

LGTM

On Jul 23, 2010, at 2:35 PM, <clifford.stein@gmail.com> wrote:

> Reviewers: ,
> 
> Description:
> This fixes a minor bug so that OSL builds on systems without LLVM
> installed.
> 
> Please review this at http://codereview.appspot.com/1860044/show
> 
> Affected files:
>   src/liboslexec/CMakeLists.txt
> 
> 
> Index: src/liboslexec/CMakeLists.txt
> ===================================================================
> --- src/liboslexec/CMakeLists.txt	(revision 786)
> +++ src/liboslexec/CMakeLists.txt	(working copy)
> @@ -68,7 +68,10 @@
>  endif ()
> 
>  ADD_LIBRARY ( oslexec SHARED ${liboslexec_srcs} )
> -TARGET_LINK_LIBRARIES ( oslexec oslcomp ${OPENIMAGEIO_LIBRARY}  
> ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} ${LLVM_LIBRARY})
> +TARGET_LINK_LIBRARIES ( oslexec oslcomp ${OPENIMAGEIO_LIBRARY}  
> ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} )
> +if (LLVM_FOUND)
> +    TARGET_LINK_LIBRARIES ( oslexec ${LLVM_LIBRARY} )
> +endif()
>  LINK_ILMBASE ( oslexec )
> 
>  INSTALL ( TARGETS oslexec LIBRARY DESTINATION lib )
> 
> 
> 

--
Larry Gritz
lg@imageworks.com

Expand All Messages | Collapse All Messages