From 30ab7b8e149f78cabd8e036d1cb89789b7c4fbec Mon Sep 17 00:00:00 2001
From: Brian Munro <brian.alexander.munro@gmail.com>
Date: Tue, 12 Feb 2019 21:37:41 +0200
Subject: [PATCH] Removed unneeded cmake variables due to that umbrella handles
 them correctly.

Requires testing.
---
 CMakeLists.txt            | 6 ------
 src/proxy/CMakeLists.txt  | 3 +--
 src/runner/CMakeLists.txt | 4 +---
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12efdf8..30add94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,12 +11,6 @@ SET(DEPENDENCIES_DIR CACHE PATH "")
 # hint to find qt in dependencies path
 LIST(APPEND CMAKE_PREFIX_PATH ${QT_ROOT}/lib/cmake)
 
-FILE(GLOB_RECURSE PYTHON_ROOT ${DEPENDENCIES_DIR}/Python*/pyconfig.h.in)
-GET_FILENAME_COMPONENT(PYTHON_ROOT ${PYTHON_ROOT} DIRECTORY)
-
-FILE(GLOB_RECURSE SIP_ROOT ${DEPENDENCIES_DIR}/sip-*/siplib/sip.h)
-GET_FILENAME_COMPONENT(SIP_ROOT ${SIP_ROOT} DIRECTORY)
-
 # need to install python
 IF(EXISTS "${PYTHON_ROOT}/PCbuild/python27.dll")
     INSTALL(FILES ${PYTHON_ROOT}/PCbuild/python27.dll DESTINATION bin)
diff --git a/src/proxy/CMakeLists.txt b/src/proxy/CMakeLists.txt
index 4df9b28..acce88a 100644
--- a/src/proxy/CMakeLists.txt
+++ b/src/proxy/CMakeLists.txt
@@ -34,8 +34,7 @@ ADD_DEFINITIONS(-DUNICODE -D_UNICODE)
 
 INCLUDE_DIRECTORIES(${project_path}/uibase/src
                     ${project_path}/plugin_python/src/runner/
-                    ${PYTHON_ROOT}/Include
-                    ${PYTHON_ROOT}/PC)
+                    ${PYTHON_ROOT}/Include)
 LINK_DIRECTORIES(${lib_path})
 
 
diff --git a/src/runner/CMakeLists.txt b/src/runner/CMakeLists.txt
index 0b5194d..88ca56b 100644
--- a/src/runner/CMakeLists.txt
+++ b/src/runner/CMakeLists.txt
@@ -37,13 +37,11 @@ SET(lib_path "${project_path}/../../install/libs")
 INCLUDE_DIRECTORIES(${project_path}/uibase/src
 					${project_path}/game_features/src
 					${PYTHON_ROOT}/Include
-					${SIP_ROOT}
 					${PYTHON_ROOT}/PC)
 
 LINK_DIRECTORIES(${lib_path}
 				 ${PYTHON_ROOT}/PCbuild
-				 ${Boost_LIBRARY_DIRS}
-				 ${SIP_ROOT})
+				 ${Boost_LIBRARY_DIRS})
 
 ADD_LIBRARY(${PROJ_NAME} SHARED ${${PROJ_NAME}_HDRS} ${${PROJ_NAME}_SRCS} ${${PROJ_NAME}_translations_qm})
 TARGET_LINK_LIBRARIES(${PROJ_NAME}