Commit efdb2394 authored by Zhiping Jiang (蒋志平)'s avatar Zhiping Jiang (蒋志平) 💬

Merge remote-tracking branch 'origin/master'

parents d8440e9a 324cd334
......@@ -2,7 +2,9 @@ IF (WIN32)
SET(ScreenCameraInfo_Source os_dependent/ScreenCameraInfo_Win.cpp)
ELSEIF (APPLE)
SET(ScreenCameraInfo_Source os_dependent/ScreenCameraInfo_Mac.cpp)
ENDIF ()
else()
SET(ScreenCameraInfo_Source os_dependent/ScreenCameraInfo_LINUX.cpp)
endif()
FILE(GLOB OpenCVExtensions_SOURCES *.* ${ScreenCameraInfo_Source})
ADD_LIBRARY(OpenCVExtensions SHARED ${OpenCVExtensions_SOURCES})
......
//
// ScreenCameraInfo.cpp
// OpenCVExtensions
//
// Created by JiangZhping on 2017/2/2.
// Copyright © 2017年 JiangZhping. All rights reserved.
//
#include "../ScreenCameraInfo.h"
#include <sys/utsname.h>
#include <sys/sysctl.h>
std::string ScreenCameraInfo::currentDeviceCode(){
return "";
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment