diff --git a/cmake/Findlibusb.cmake b/cmake/Findlibusb.cmake index 3e21b98a..716afd1b 100644 --- a/cmake/Findlibusb.cmake +++ b/cmake/Findlibusb.cmake @@ -23,6 +23,7 @@ find_library(LIBUSB_LIBRARY PATHS /usr/local/lib /opt/local/lib + /usr/local/Cellar/libusb/1.0.21 /usr/lib ) diff --git a/heimdall-frontend/CMakeLists.txt b/heimdall-frontend/CMakeLists.txt index 05a9e75f..916c7a86 100644 --- a/heimdall-frontend/CMakeLists.txt +++ b/heimdall-frontend/CMakeLists.txt @@ -52,5 +52,7 @@ target_link_libraries(heimdall-frontend Qt5::Widgets) target_link_libraries(heimdall-frontend z) install (TARGETS heimdall-frontend RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}/bin + RESOURCE DESTINATION ${CMAKE_INSTALL_PREFIX} + BUNDLE DESTINATION ${CMAKE_INSTALL_PREFIX} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/heimdall/CMakeLists.txt b/heimdall/CMakeLists.txt index 7aa1313e..60815ab1 100644 --- a/heimdall/CMakeLists.txt +++ b/heimdall/CMakeLists.txt @@ -7,6 +7,9 @@ if((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux") AND (NOT DEFINED libusb_USE_STATIC endif((NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux") AND (NOT DEFINED libusb_USE_STATIC_LIBS)) find_package(libusb REQUIRED) +#find_library(CF CoreFoundation) +#find_library(IOK IOKit) +#target_link_libraries(heimdall ${CF} ${IOK}) set(LIBPIT_INCLUDE_DIRS ../libpit/source) @@ -15,6 +18,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") if(MINGW) set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static") +else(NOT MINGW) + set(CMAKE_EXE_LINKER_FLAGS "-lobjc -framework IOKit -framework CoreFoundation") endif(MINGW) if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") diff --git a/libpit/CMakeLists.txt b/libpit/CMakeLists.txt index 3ba2e50d..38246aa5 100644 --- a/libpit/CMakeLists.txt +++ b/libpit/CMakeLists.txt @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 2.8.4) project(libpit) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11") +set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Dnullptr=NULL") set(LIBPIT_SOURCE_FILES source/libpit.cpp)