Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit af5c83a4 authored by Romain Hunault's avatar Romain Hunault
Browse files

Fix macOS issues

parent a2cfdaa5

heimdall-frontend/CMakeLists.txt

+10 −2
Original line number Diff line number Diff line
@@ -11,7 +11,14 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) # moc files are generated in build (current) d 
find_package(Qt5Widgets REQUIRED)

find_package(ZLIB REQUIRED)



if(APPLE)

    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

    set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")

    set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")

    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lobjc -framework IOKit -framework CoreFoundation")

else()

    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")

endif()



if(MINGW)

    set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")
@@ -52,5 +59,6 @@ target_link_libraries(heimdall-frontend Qt5::Widgets) 
target_link_libraries(heimdall-frontend z)

install (TARGETS heimdall-frontend

		RUNTIME	DESTINATION ${CMAKE_INSTALL_PREFIX}/bin

		LIBRARY	DESTINATION ${CMAKE_INSTALL_LIBDIR})

		LIBRARY	DESTINATION ${CMAKE_INSTALL_LIBDIR}

		BUNDLE DESTINATION /Applications)

heimdall/CMakeLists.txt

+8 −1
Original line number Diff line number Diff line
@@ -11,7 +11,14 @@ find_package(libusb REQUIRED) 
set(LIBPIT_INCLUDE_DIRS

    ../libpit/source)



if(APPLE)

    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")

    set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LANGUAGE_STANDARD "c++11")

    set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")

    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lobjc -framework IOKit -framework CoreFoundation")

else()

    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")

endif()



if(MINGW)

    set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++ -static")

libpit/CMakeLists.txt

+3 −1
Original line number Diff line number Diff line 
cmake_minimum_required(VERSION 2.8.4)

project(libpit)



if(NOT APPLE)

    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")

endif()



set(LIBPIT_SOURCE_FILES

    source/libpit.cpp)