aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Dobell <benjamin.dobell+git@glassechidna.com.au>2015-02-20 02:13:02 +1100
committerBenjamin Dobell <benjamin.dobell+git@glassechidna.com.au>2015-02-20 02:15:31 +1100
commite2f0470fafa70e01dcb3732736f555a1f0b3b800 (patch)
tree75ff1dee2102884d7e9bf9a26b1555b98494c761
parentdf988075c73616c007e3e02e8cca9e9bbc681985 (diff)
downloadexternal_heimdall-e2f0470fafa70e01dcb3732736f555a1f0b3b800.zip
external_heimdall-e2f0470fafa70e01dcb3732736f555a1f0b3b800.tar.gz
external_heimdall-e2f0470fafa70e01dcb3732736f555a1f0b3b800.tar.bz2
Fix FindLibusb.cmake and make CMake setup IDE compatible
-rw-r--r--CMakeLists.txt4
-rw-r--r--cmake/Findlibusb.cmake2
2 files changed, 5 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 372a604..a4f694d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,6 +6,10 @@ set(CMAKE_MODULE_PATH
project(Heimdall)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+
add_subdirectory(libpit)
add_subdirectory(heimdall)
add_subdirectory(heimdall-frontend)
+
+add_dependencies(heimdall-frontend heimdall)
diff --git a/cmake/Findlibusb.cmake b/cmake/Findlibusb.cmake
index 4b099d3..69811bc 100644
--- a/cmake/Findlibusb.cmake
+++ b/cmake/Findlibusb.cmake
@@ -27,7 +27,7 @@ find_library(LIBUSB_LIBRARY
)
include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LIBUSB REQUIRED_VARS LIBUSB_LIBRARY LIBUSB_INCLUDE_DIR)
+find_package_handle_standard_args(libusb REQUIRED_VARS LIBUSB_LIBRARY LIBUSB_INCLUDE_DIR)
if (LIBUSB_FOUND)
set(LIBUSB_INCLUDE_DIRS ${LIBUSB_INCLUDE_DIR})