[x265] [PATCH] cmake: fix bugs in Cmake to compile M30 in UNIX
aarthi at multicorewareinc.com
aarthi at multicorewareinc.com
Wed Mar 1 09:39:06 CET 2017
# HG changeset patch
# User Aarthi Thirumalai
# Date 1488352996 -19800
# Wed Mar 01 12:53:16 2017 +0530
# Branch hybrid
# Node ID 94a68f3c27e87c70dfea8240522b919824927a69
# Parent 56e3e5f58ae5f7958a4d46423b7a78fe448adf45
cmake: fix bugs in Cmake to compile M30 in UNIX
diff -r 56e3e5f58ae5 -r 94a68f3c27e8 source/CMakeLists.txt
--- a/source/CMakeLists.txt Tue Feb 28 08:04:33 2017 +0530
+++ b/source/CMakeLists.txt Wed Mar 01 12:53:16 2017 +0530
@@ -25,29 +25,49 @@
source_group(gop-parallel FILES ${GopParallelFiles})
source_group(cappedvbr FILES ${CappedVbrFiles})
-if(GCC)
-include_directories( m30/)
-file(GLOB M30Encoder m30/*.cpp m30/*.h)
-source_group(m30Encoder FILES ${M30Encoder})
-endif(GCC)
+if(UNIX)
+ include_directories( m30/)
+ file(GLOB M30Encoder m30/*.cpp m30/*.h)
+ source_group(m30Encoder FILES ${M30Encoder})
+endif(UNIX)
list(APPEND VFLAGS "-DUHDKIT_VERSION=${UHDKIT_VERSION}")
string(REPLACE ";" " " VERSION_FLAGS "${VFLAGS}")
set_source_files_properties(version.cpp PROPERTIES COMPILE_FLAGS ${VERSION_FLAGS})
-add_library(uhdkit-api OBJECT
- ../uhdkit.h uhdkit-encoder.h
- uhdkit-param.cpp uhdkit-param.h
- api-uhdkit.cpp
- version.cpp
- uhdkit-preprocess.cpp uhdkit-preprocess.h
- uhdkit-sharpentext.cpp uhdkit-sharpentext.h
- ../uhdkit-extras.cpp ../uhdkit-extras.h
- uhdkit-scalinglistgenerator.cpp uhdkit-scalinglistgenerator.h
- ${PCSFiles}
- ${MultiencoderFiles}
- ${GopParallelFiles}
- ${CappedVbrFiles}
- )
+
+if(UNIX)
+ add_library(uhdkit-api OBJECT
+ ../uhdkit.h uhdkit-encoder.h
+ uhdkit-param.cpp uhdkit-param.h
+ api-uhdkit.cpp
+ version.cpp
+ uhdkit-preprocess.cpp uhdkit-preprocess.h
+ uhdkit-sharpentext.cpp uhdkit-sharpentext.h
+ ../uhdkit-extras.cpp ../uhdkit-extras.h
+ uhdkit-scalinglistgenerator.cpp uhdkit-scalinglistgenerator.h
+ ${PCSFiles}
+ ${MultiencoderFiles}
+ ${GopParallelFiles}
+ ${CappedVbrFiles}
+ ${M30Encoder}
+ )
+else()
+ add_library(uhdkit-api OBJECT
+ ../uhdkit.h uhdkit-encoder.h
+ uhdkit-param.cpp uhdkit-param.h
+ api-uhdkit.cpp
+ version.cpp
+ uhdkit-preprocess.cpp uhdkit-preprocess.h
+ uhdkit-sharpentext.cpp uhdkit-sharpentext.h
+ ../uhdkit-extras.cpp ../uhdkit-extras.h
+ uhdkit-scalinglistgenerator.cpp uhdkit-scalinglistgenerator.h
+ ${PCSFiles}
+ ${MultiencoderFiles}
+ ${GopParallelFiles}
+ ${CappedVbrFiles}
+ )
+endif(UNIX)
+
if(TEXT_DETECTOR AND UNIX)
add_definitions(-DTEXT_DETECTOR=1)
endif()
-------------- next part --------------
A non-text attachment was scrubbed...
Name: uhdkit-hybrid.patch
Type: text/x-patch
Size: 2626 bytes
Desc: not available
URL: <http://mailman.videolan.org/pipermail/x265-devel/attachments/20170301/8b1ef99b/attachment.bin>
More information about the x265-devel
mailing list