Add macOS support #34
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				BlockStorage/repertory/pipeline/head This commit looks good
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	BlockStorage/repertory/pipeline/head This commit looks good
				
			This commit is contained in:
		@@ -148,6 +148,7 @@ libvlc
 | 
				
			|||||||
linkflags
 | 
					linkflags
 | 
				
			||||||
localappdata
 | 
					localappdata
 | 
				
			||||||
lpbyte
 | 
					lpbyte
 | 
				
			||||||
 | 
					lpthread
 | 
				
			||||||
lptr
 | 
					lptr
 | 
				
			||||||
lpwstr
 | 
					lpwstr
 | 
				
			||||||
markdownlint
 | 
					markdownlint
 | 
				
			||||||
@@ -171,6 +172,7 @@ nuspell_version
 | 
				
			|||||||
oleaut32
 | 
					oleaut32
 | 
				
			||||||
openal_version
 | 
					openal_version
 | 
				
			||||||
openssldir
 | 
					openssldir
 | 
				
			||||||
 | 
					osxfuse
 | 
				
			||||||
pistream
 | 
					pistream
 | 
				
			||||||
pkgconfig
 | 
					pkgconfig
 | 
				
			||||||
plarge_integer
 | 
					plarge_integer
 | 
				
			||||||
@@ -182,6 +184,7 @@ project_enable_libdsm
 | 
				
			|||||||
project_enable_nana
 | 
					project_enable_nana
 | 
				
			||||||
propgrid
 | 
					propgrid
 | 
				
			||||||
psecurity_descriptor
 | 
					psecurity_descriptor
 | 
				
			||||||
 | 
					pthreads
 | 
				
			||||||
pugi
 | 
					pugi
 | 
				
			||||||
pugixml_project
 | 
					pugixml_project
 | 
				
			||||||
puint32
 | 
					puint32
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -89,7 +89,11 @@ set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${PROJECT_RELEASE_FLAG_L
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
set(CMAKE_EXE_LINKER_FLAGS "${PROJECT_CMAKE_EXE_LINKER_FLAGS}")
 | 
					set(CMAKE_EXE_LINKER_FLAGS "${PROJECT_CMAKE_EXE_LINKER_FLAGS}")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
set(EXTERNAL_CMAKE_CXX_FLAGS "-include cstdint -include utility -fext-numeric-literals ${PROJECT_COMMON_FLAG_LIST}")
 | 
					set(EXTERNAL_CMAKE_CXX_FLAGS "-include cstdint -include utility ${PROJECT_COMMON_FLAG_LIST}")
 | 
				
			||||||
 | 
					if (NOT PROJECT_IS_DARWIN)
 | 
				
			||||||
 | 
					  set(EXTERNAL_CMAKE_CXX_FLAGS "-fext-numeric-literals ${EXTERNAL_CMAKE_CXX_FLAGS}")
 | 
				
			||||||
 | 
					endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
list(APPEND PROJECT_EXTERNAL_CMAKE_FLAGS
 | 
					list(APPEND PROJECT_EXTERNAL_CMAKE_FLAGS
 | 
				
			||||||
  -DCMAKE_BUILD_TYPE=${PROJECT_CMAKE_BUILD_TYPE}
 | 
					  -DCMAKE_BUILD_TYPE=${PROJECT_CMAKE_BUILD_TYPE}
 | 
				
			||||||
  -DCMAKE_COLOR_MAKEFILE=${CMAKE_COLOR_MAKEFILE}
 | 
					  -DCMAKE_COLOR_MAKEFILE=${CMAKE_COLOR_MAKEFILE}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -39,6 +39,14 @@ if(PROJECT_ENABLE_BOOST)
 | 
				
			|||||||
          wserialization
 | 
					          wserialization
 | 
				
			||||||
      )
 | 
					      )
 | 
				
			||||||
    else()
 | 
					    else()
 | 
				
			||||||
 | 
					      if(PROJECT_IS_DARWIN)
 | 
				
			||||||
 | 
					        set(CMAKE_HAVE_THREADS_LIBRARY 1)
 | 
				
			||||||
 | 
					        set(CMAKE_THREAD_LIBS_INIT "-lpthread")
 | 
				
			||||||
 | 
					        set(CMAKE_USE_PTHREADS_INIT 1)
 | 
				
			||||||
 | 
					        set(CMAKE_USE_WIN32_THREADS_INIT 0)
 | 
				
			||||||
 | 
					        set(THREADS_PREFER_PTHREAD_FLAG ON)
 | 
				
			||||||
 | 
					      endif()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      find_package(Boost ${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_PATCH_VERSION}
 | 
					      find_package(Boost ${BOOST_MAJOR_VERSION}.${BOOST_MINOR_VERSION}.${BOOST_PATCH_VERSION}
 | 
				
			||||||
        REQUIRED
 | 
					        REQUIRED
 | 
				
			||||||
        COMPONENTS
 | 
					        COMPONENTS
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -20,17 +20,25 @@ if(PROJECT_ENABLE_FUSE AND NOT PROJECT_IS_MINGW)
 | 
				
			|||||||
      endif()
 | 
					      endif()
 | 
				
			||||||
    endif()
 | 
					    endif()
 | 
				
			||||||
  else()
 | 
					  else()
 | 
				
			||||||
    pkg_check_modules(LIBFUSE3 fuse3>=3.0.0)
 | 
					    if (PROJECT_IS_DARWIN)
 | 
				
			||||||
    if(LIBFUSE3_FOUND)
 | 
					      find_library(OSXFUSE NO_CACHE NAMES OSXFUSE)
 | 
				
			||||||
      set(PROJECT_FUSE fuse3)
 | 
					      if (NOT OSXFUSE)
 | 
				
			||||||
      set(PROJECT_FUSE_INCLUDE_DIRS ${LIBFUSE3_INCLUDE_DIRS})
 | 
					        message(FATAL_ERROR "FUSE for macOS not found (https://macfuse.github.io)")
 | 
				
			||||||
 | 
					      endif ()
 | 
				
			||||||
 | 
					      set(PROJECT_FUSE fuse2)
 | 
				
			||||||
    else()
 | 
					    else()
 | 
				
			||||||
      pkg_check_modules(LIBFUSE2 fuse>=2.9.0)
 | 
					      pkg_check_modules(LIBFUSE3 fuse3>=3.0.0)
 | 
				
			||||||
      if(LIBFUSE2_FOUND)
 | 
					      if(LIBFUSE3_FOUND)
 | 
				
			||||||
        set(PROJECT_FUSE fuse2)
 | 
					        set(PROJECT_FUSE fuse3)
 | 
				
			||||||
        set(PROJECT_FUSE_INCLUDE_DIRS ${LIBFUSE2_INCLUDE_DIRS})
 | 
					        set(PROJECT_FUSE_INCLUDE_DIRS ${LIBFUSE3_INCLUDE_DIRS})
 | 
				
			||||||
      else()
 | 
					      else()
 | 
				
			||||||
        message(FATAL_ERROR "fuse library not found")
 | 
					        pkg_check_modules(LIBFUSE2 fuse>=2.9.0)
 | 
				
			||||||
 | 
					        if(LIBFUSE2_FOUND)
 | 
				
			||||||
 | 
					          set(PROJECT_FUSE fuse2)
 | 
				
			||||||
 | 
					          set(PROJECT_FUSE_INCLUDE_DIRS ${LIBFUSE2_INCLUDE_DIRS})
 | 
				
			||||||
 | 
					        else()
 | 
				
			||||||
 | 
					          message(FATAL_ERROR "fuse library not found")
 | 
				
			||||||
 | 
					        endif()
 | 
				
			||||||
      endif()
 | 
					      endif()
 | 
				
			||||||
    endif()
 | 
					    endif()
 | 
				
			||||||
  endif()
 | 
					  endif()
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user