From b84c9cba71713c6c3d65539c015910fa8bc18414 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sun, 4 Sep 2016 11:13:38 -0500
Subject: [PATCH] More self-contained tweaks
---
.gitmodules | 4 ++--
CMakeLists.txt | 5 ++++-
submodules/llvm | 1 -
submodules/{ => llvm/tools}/clang | 0
4 files changed, 6 insertions(+), 4 deletions(-)
delete mode 160000 submodules/llvm
rename submodules/{ => llvm/tools}/clang (100%)
diff --git a/.gitmodules b/.gitmodules
index 34a18700..ef55f1f2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,6 +10,6 @@
[submodule "submodules/llvm"]
path = submodules/llvm
url = https://github.com/llvm-mirror/llvm.git
-[submodule "submodules/clang"]
- path = submodules/clang
+[submodule "submodules/llvm/tools/clang"]
+ path = submodules/llvm/tools/clang
url = https://github.com/llvm-mirror/clang.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3d37d206..599693f6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,9 @@
cmake_minimum_required(VERSION 2.6)
project (pyopencl)
+
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/submodules/pocl/cmake")
+
+set(KERNELLIB_HOST_CPU_VARIANTS "distro")
add_subdirectory(submodules/llvm)
-add_subdirectory(submodules/clang)
add_subdirectory(submodules/pocl)
diff --git a/submodules/llvm b/submodules/llvm
deleted file mode 160000
index 1f44212e..00000000
--- a/submodules/llvm
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1f44212e7e440274e13aabf36a53b1d2df013fe7
diff --git a/submodules/clang b/submodules/llvm/tools/clang
similarity index 100%
rename from submodules/clang
rename to submodules/llvm/tools/clang
--
GitLab