Merge branch 'x64' of https://github.com/debris/cpp-ethereum into x64

libethash-cl/CMakeLists.txt

@@ -9,7 +9,7 @@ aux_source_directory(. SRC_LIST)
 file(GLOB HEADERS "*.h")
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${OpenCL_INCLUDE_DIRS}})
+include_directories(${OpenCL_INCLUDE_DIRS})
 include_directories(..)
 add_library(${EXECUTABLE} ${SRC_LIST} ${HEADERS})
 TARGET_LINK_LIBRARIES(${EXECUTABLE} ${OpenCL_LIBRARIES} ethash)

libethcore/CMakeLists.txt

@@ -11,6 +11,11 @@ aux_source_directory(. SRC_LIST)
 
 include_directories(BEFORE ..)
 include_directories(${Boost_INCLUDE_DIRS})
+
+if (ETHASHCL)
+	include_directories(${OpenCL_INCLUDE_DIRS})
+endif ()
+
 if (CPUID_FOUND)
 	include_directories(${Cpuid_INCLUDE_DIRS})
 endif ()