Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Compile Issues on macOS High Sierra 10.13.4 #468

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix Compile Issues on macOS High Sierra 10.13.4 #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4bb5d18
Fix issues on OSX compilation outlined in https://github.com/Benjamin…
May 6, 2018
2aae979
Fix error when compiling libpit on macOS High Sierra 10.13.4
May 6, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions cmake/Findlibusb.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ find_library(LIBUSB_LIBRARY
PATHS
/usr/local/lib
/opt/local/lib
/usr/local/Cellar/libusb/1.0.21
/usr/lib
)

Expand Down
2 changes: 2 additions & 0 deletions heimdall-frontend/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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})

5 changes: 5 additions & 0 deletions heimdall/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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")
Comment on lines +21 to +22
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This also breaks compilation on linux. I have tried else((NOT MINGW) AND (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Linux")) but it appears to make no difference: compilation still fails on linux.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using the changes from e.foundation is cleaner than the changes suggested here, since they don't break compilation for other platforms. This works and compiles well on my fork:

endif(MINGW)

if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
Expand Down
2 changes: 1 addition & 1 deletion libpit/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This seems to break compilation on linux and windows according to the newly introduced github action

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using the changes from e.foundation is cleaner than the changes suggested here, since they don't break compilation for other platforms. This works and compiles well on my fork:


set(LIBPIT_SOURCE_FILES
source/libpit.cpp)
Expand Down