Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support (and minor fixes) for building with clang 5.0 #1746

Merged
merged 1 commit into from
Aug 18, 2017
Merged

Support (and minor fixes) for building with clang 5.0 #1746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 5 additions & 15 deletions site/spi/Makefile-bits-arnold
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,25 +57,15 @@ ifeq ($(SP_OS), rhel7)

## If not overridden, here is our preferred LLVM installation
## (may be changed as new versions are rolled out to the facility)
LLVM_DIRECTORY ?= /shots/spi/home/lib/arnold/rhel7/llvm_4.0_final/
LLVM_DIRECTORY ?= /shots/spi/home/lib/arnold/rhel7/llvm_4.0_final

# A variety of tags can be used to try specific versions of gcc or
# clang from the site-specific places we have installed them.
ifeq (${COMPILER}, clang342)
MY_CMAKE_FLAGS += \
-DCMAKE_C_COMPILER=/shots/spi/home/lib/arnold/spinux1/llvm_3.4.2/bin/clang \
-DCMAKE_CXX_COMPILER=/shots/spi/home/lib/arnold/spinux1/llvm_3.4.2/bin/clang++
else ifeq (${COMPILER}, clang35)
MY_CMAKE_FLAGS += \
-DCMAKE_C_COMPILER=/shots/spi/home/lib/arnold/spinux1/llvm_3.5/bin/clang \
-DCMAKE_CXX_COMPILER=/shots/spi/home/lib/arnold/spinux1/llvm_3.5/bin/clang++
else ifeq (${COMPILER},clang38)
MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=clang-3.8 -DCMAKE_CXX_COMPILER=clang++-3.8
else ifeq (${COMPILER},clang39)
LLVM_DIRECTORY := /shots/spi/home/lib/arnold/rhel7/llvm_3.9
ifeq (${COMPILER},clang4)
LLVM_DIRECTORY := /shots/spi/home/lib/arnold/rhel7/llvm_4.0_final
MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++
else ifeq (${COMPILER},clang40)
LLVM_DIRECTORY := /shots/spi/home/lib/arnold/rhel7/llvm_4.0
else ifeq (${COMPILER},clang5)
LLVM_DIRECTORY := /shots/spi/home/lib/arnold/rhel7/llvm_5.0_RC2
MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++
else ifeq (${COMPILER},clang)
MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
Expand Down
18 changes: 4 additions & 14 deletions site/spi/Makefile-bits-spcomp2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,21 +101,11 @@ ifeq ($(SP_OS), rhel7)

# A variety of tags can be used to try specific versions of gcc or
# clang from the site-specific places we have installed them.
ifeq (${COMPILER}, clang342)
MY_CMAKE_FLAGS += \
-DCMAKE_C_COMPILER=/shots/spi/home/lib/arnold/spinux1/llvm_3.4.2/bin/clang \
-DCMAKE_CXX_COMPILER=/shots/spi/home/lib/arnold/spinux1/llvm_3.4.2/bin/clang++
else ifeq (${COMPILER}, clang35)
MY_CMAKE_FLAGS += \
-DCMAKE_C_COMPILER=/shots/spi/home/lib/arnold/spinux1/llvm_3.5/bin/clang \
-DCMAKE_CXX_COMPILER=/shots/spi/home/lib/arnold/spinux1/llvm_3.5/bin/clang++
else ifeq (${COMPILER},clang38)
MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=clang-3.8 -DCMAKE_CXX_COMPILER=clang++-3.8
else ifeq (${COMPILER},clang39)
LLVM_DIRECTORY := /shots/spi/home/lib/arnold/rhel7/llvm_3.9
ifeq (${COMPILER},clang4)
LLVM_DIRECTORY := /shots/spi/home/lib/arnold/rhel7/llvm_4.0_final
MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++
else ifeq (${COMPILER},clang40)
LLVM_DIRECTORY := /shots/spi/home/lib/arnold/rhel7/llvm_4.0
else ifeq (${COMPILER},clang5)
LLVM_DIRECTORY := /shots/spi/home/lib/arnold/rhel7/llvm_5.0
MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=${LLVM_DIRECTORY}/bin/clang -DCMAKE_CXX_COMPILER=${LLVM_DIRECTORY}/bin/clang++
else ifeq (${COMPILER},clang)
MY_CMAKE_FLAGS += -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
Expand Down
5 changes: 5 additions & 0 deletions src/nuke/txReader/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
include_directories (${NUKE_INCLUDE_DIRS})
link_directories (${NUKE_LIBRARY_DIRS})

# Ignore Nuke 10's use of deprecated auto_ptr
if (NOT MSVC)
set_source_files_properties (txReader.cpp PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations)
endif ()

add_library (txReader SHARED
txReader.cpp)

Expand Down
5 changes: 5 additions & 0 deletions src/nuke/txWriter/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
include_directories (${NUKE_INCLUDE_DIRS})
link_directories (${NUKE_LIBRARY_DIRS})

# Ignore Nuke 10's use of deprecated auto_ptr
if (NOT MSVC)
set_source_files_properties (txWriter.cpp PROPERTIES COMPILE_FLAGS -Wno-deprecated-declarations)
endif ()

add_library (txWriter SHARED
txWriter.cpp)

Expand Down