aaron/ispc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1155 from dbabokin/cmake

Browse Source 
improvements in cmake build support
This commit is contained in:
Dmitry Babokin
2016-01-29 23:29:39 +03:00
parent 1370596c5e 40718c0ad3
commit 4e24a94ff4
2 changed files with 21 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -89,7 +89,8 @@ else
endif endif
ARCH_TYPE = $(shell arch) ARCH_TYPE = $(shell arch)
LLVM_CXXFLAGS=$(shell $(LLVM_CONFIG) --cppflags) DNDEBUG_FLAG=$(shell $(LLVM_CONFIG) --cxxflags | grep -o "\-DNDEBUG")
LLVM_CXXFLAGS=$(shell $(LLVM_CONFIG) --cppflags) $(DNDEBUG_FLAG)
LLVM_VERSION=LLVM_$(shell $(LLVM_CONFIG) --version | sed -e 's/svn//' -e 's/\./_/' -e 's/\..*//') LLVM_VERSION=LLVM_$(shell $(LLVM_CONFIG) --version | sed -e 's/svn//' -e 's/\./_/' -e 's/\..*//')
LLVM_VERSION_DEF=-D$(LLVM_VERSION) LLVM_VERSION_DEF=-D$(LLVM_VERSION)

29
alloy.py
View File

@@ -248,12 +248,17 @@ def build_LLVM(version_LLVM, revision, folder, tarball, debug, selfbuild, extra,
os.makedirs(LLVM_BIN_selfbuild) os.makedirs(LLVM_BIN_selfbuild)
os.chdir(LLVM_BUILD_selfbuild) os.chdir(LLVM_BUILD_selfbuild)
if version_LLVM == "trunk": if version_LLVM == "trunk":
# TODO: gcc root, mac_root
try_do_LLVM("configure release version for selfbuild ", try_do_LLVM("configure release version for selfbuild ",
"cmake -G Unix\ Makefiles" + " -DCMAKE_EXPORT_COMPILE_COMMANDS=ON" + "cmake -G Unix\ Makefiles" + " -DCMAKE_EXPORT_COMPILE_COMMANDS=ON" +
selfbuild_compiler +
" -DCMAKE_INSTALL_PREFIX=" + llvm_home + "/" + LLVM_BIN_selfbuild + " -DCMAKE_INSTALL_PREFIX=" + llvm_home + "/" + LLVM_BIN_selfbuild +
" -DCMAKE_BUILD_TYPE:STRING=Release" + " ../" + LLVM_SRC, " -DCMAKE_BUILD_TYPE=Release" +
" -DLLVM_ENABLE_ASSERTIONS=ON" +
" -DLLVM_TARGETS_TO_BUILD=NVPTX\;X86" +
" ../" + LLVM_SRC,
from_validation) from_validation)
selfbuild_compiler = (" -DCMAKE_C_COMPILER=" +llvm_home+ "/" + LLVM_BIN_selfbuild + "/bin/clang " +
" -DCMAKE_CXX_COMPILER="+llvm_home+ "/" + LLVM_BIN_selfbuild + "/bin/clang++ ")
else: else:
try_do_LLVM("configure release version for selfbuild ", try_do_LLVM("configure release version for selfbuild ",
"../" + LLVM_SRC + "/configure --prefix=" + llvm_home + "/" + "../" + LLVM_SRC + "/configure --prefix=" + llvm_home + "/" +
@@ -262,29 +267,29 @@ def build_LLVM(version_LLVM, revision, folder, tarball, debug, selfbuild, extra,
((" --with-gcc-toolchain=" + gcc_toolchain_path) if gcc_toolchain_path != "" else "") + ((" --with-gcc-toolchain=" + gcc_toolchain_path) if gcc_toolchain_path != "" else "") +
mac_system_root, mac_system_root,
from_validation) from_validation)
selfbuild_compiler = ("CC=" +llvm_home+ "/" + LLVM_BIN_selfbuild + "/bin/clang " +
"CXX="+llvm_home+ "/" + LLVM_BIN_selfbuild + "/bin/clang++ ")
try_do_LLVM("build release version for selfbuild ", try_do_LLVM("build release version for selfbuild ",
make, from_validation) make, from_validation)
try_do_LLVM("install release version for selfbuild ", try_do_LLVM("install release version for selfbuild ",
"make install", "make install",
from_validation) from_validation)
os.chdir("../") os.chdir("../")
if version_LLVM == "trunk":
selfbuild_compiler = (" -DCMAKE_C_COMPILER=" +llvm_home+ "/" + LLVM_BIN_selfbuild + "/bin/clang " +
" -DCMAKE_CXX_COMPILER="+llvm_home+ "/" + LLVM_BIN_selfbuild + "/bin/clang++ ")
else:
selfbuild_compiler = ("CC=" +llvm_home+ "/" + LLVM_BIN_selfbuild + "/bin/clang " +
"CXX="+llvm_home+ "/" + LLVM_BIN_selfbuild + "/bin/clang++ ")
print_debug("Now we have compiler for selfbuild: " + selfbuild_compiler + "\n", from_validation, alloy_build) print_debug("Now we have compiler for selfbuild: " + selfbuild_compiler + "\n", from_validation, alloy_build)
os.chdir(LLVM_BUILD) os.chdir(LLVM_BUILD)
if debug == False: if debug == False:
if current_OS != "Windows": if current_OS != "Windows":
if version_LLVM == "trunk": if version_LLVM == "trunk":
# TODO: gcc root, mac_root
try_do_LLVM("configure release version ", try_do_LLVM("configure release version ",
"cmake -G Unix\ Makefiles" + " -DCMAKE_EXPORT_COMPILE_COMMANDS=ON" + "cmake -G Unix\ Makefiles" + " -DCMAKE_EXPORT_COMPILE_COMMANDS=ON" +
selfbuild_compiler + selfbuild_compiler +
" -DCMAKE_INSTALL_PREFIX=" + llvm_home + "/" + LLVM_BIN + " -DCMAKE_INSTALL_PREFIX=" + llvm_home + "/" + LLVM_BIN +
" -DCMAKE_BUILD_TYPE:STRING=Release" + " ../" + LLVM_SRC, " -DCMAKE_BUILD_TYPE=Release" +
" -DLLVM_ENABLE_ASSERTIONS=ON" +
" -DLLVM_TARGETS_TO_BUILD=NVPTX\;X86" +
" ../" + LLVM_SRC,
from_validation) from_validation)
else: else:
try_do_LLVM("configure release version ", try_do_LLVM("configure release version ",
@@ -301,11 +306,15 @@ def build_LLVM(version_LLVM, revision, folder, tarball, debug, selfbuild, extra,
from_validation) from_validation)
else: else:
if version_LLVM == "trunk": if version_LLVM == "trunk":
# TODO: gcc root, mac_root
try_do_LLVM("configure debug version ", try_do_LLVM("configure debug version ",
"cmake -G Unix\ Makefiles" + " -DCMAKE_EXPORT_COMPILE_COMMANDS=ON" + "cmake -G Unix\ Makefiles" + " -DCMAKE_EXPORT_COMPILE_COMMANDS=ON" +
selfbuild_compiler + selfbuild_compiler +
" -DCMAKE_INSTALL_PREFIX=" + llvm_home + "/" + LLVM_BIN + " -DCMAKE_INSTALL_PREFIX=" + llvm_home + "/" + LLVM_BIN +
" -DCMAKE_BUILD_TYPE:STRING=Debug" + " ../" + LLVM_SRC, " -DCMAKE_BUILD_TYPE=Debug" +
" -DLLVM_ENABLE_ASSERTIONS=ON" +
" -DLLVM_TARGETS_TO_BUILD=NVPTX\;X86" +
" ../" + LLVM_SRC,
from_validation) from_validation)
else: else:
try_do_LLVM("configure debug version ", try_do_LLVM("configure debug version ",