+22
-11
lines changedFilter options
+22
-11
lines changed Original file line number Diff line number Diff line change
@@ -12,9 +12,6 @@ set(CMAKE_CONFIGURATION_TYPES "Debug;Release")
12 12
add_definitions(-D_ALLOCATOR=1 -DWARPSTUFF=1)
13 13 14 14
if (WIN32)
15 -
include(ucm.cmake)
16 -
ucm_set_runtime(STATIC)
17 - 18 15
SET(COMPILER_FLAGS "")
19 16
SET(COMPILER_FLAGS_W_OMP "/openmp" )
20 17
SET(ADDITIONAL_LIBS "")
@@ -33,14 +30,13 @@ if (APPLE)
33 30
SET(ADDITIONAL_LIBS "-lpthread")
34 31
endif (APPLE)
35 32 36 -
set(CMAKE_CONFIGURATION_TYPES "Debug;Release")
37 - 38 33
include_directories("Common" "Tables" "Codec" "ConvertLib" "WarpLib" "Example")
39 34
file(GLOB CODEC_SOURCES "Codec/*.c" "Codec/*.h" "Codec/*.cpp" "WarpLib/*.c" "WarpLib/*.h" )
40 35
file(GLOB ENCODER_SOURCES "EncoderSDK/*.cpp" "Common/*.h")
41 36
file(GLOB DECODER_SOURCES "DecoderSDK/*.cpp" "Common/*.h" "WarpLib/*.c" "WarpLib/*.h" "ConvertLib/*.cpp" "ConvertLib/*.h" )
42 37
file(GLOB EXAMPLE_SOURCE "Example/*.cpp" "Example/*.h" )
43 38
file(GLOB WAVELETDEMO_SOURCE "Example/WaveletDemo/*.c" "Example/WaveletDemo/*.h" )
39 +
file(GLOB PUBLIC_HEADERS "Common/*.h")
44 40 45 41
# Build CFHDCodec library (static and shared rules)
46 42
if (BUILD_LIBS)
@@ -117,19 +113,26 @@ set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Installation prefix
117 113
set(BIN_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/bin CACHE PATH "Installation prefix for user executables" FORCE)
118 114
set(LIB_INSTALL_DIR ${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX} CACHE PATH "Installation prefix for object code libraries" FORCE)
119 115
set(INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/include/cineformsdk CACHE PATH "Installation prefix for header files" FORCE)
120 -
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcineformsdk.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libcineformsdk.pc)
121 116 122 117
# System wide installation
123 118
if (BUILD_STATIC)
124 119
if (BUILD_SEPARATED)
125 -
install(TARGETS CFHDEncoderStatic CFHDDecoderStatic DESTINATION lib/)
120 +
set(TARGET_NAMES CFHDEncoderStatic CFHDDecoderStatic)
126 121
else (BUILD_SEPARATED)
127 -
install(TARGETS CFHDCodecStatic DESTINATION lib/)
122 +
set(TARGET_NAMES CFHDCodecStatic)
128 123
endif (BUILD_SEPARATED)
129 124
else (BUILD_STATIC)
130 125
if (BUILD_SEPARATED)
131 -
install(TARGETS CFHDEncoder CFHDDecoder DESTINATION lib/)
126 +
set(TARGET_NAMES CFHDEncoder CFHDDecoder)
132 127
else (BUILD_SEPARATED)
133 -
install(TARGETS CFHDCodecShared DESTINATION lib/)
128 +
set(TARGET_NAMES CFHDCodecShared)
134 129
endif (BUILD_SEPARATED)
135 130
endif (BUILD_STATIC)
131 +
foreach(TARGET_NAME ${TARGET_NAMES})
132 +
set(LIB_INSTALL_NAMES ${LIB_INSTALL_NAMES} -l${TARGET_NAME})
133 +
endforeach()
134 +
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libcineformsdk.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libcineformsdk.pc)
135 + 136 +
install(TARGETS ${TARGET_NAMES} DESTINATION lib/)
137 +
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libcineformsdk.pc DESTINATION lib/pkgconfig)
138 +
install(FILES ${PUBLIC_HEADERS} DESTINATION ${INCLUDE_INSTALL_DIR})
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
1 +
{
2 +
"version": "1.0",
3 +
"info": {
4 +
"type": "lib",
5 +
"visibility": "public",
6 +
"platforms": ["macos", "win", "linux"]
7 +
}
8 +
}
Original file line number Diff line number Diff line change
@@ -7,5 +7,5 @@ Name: ${PROJECT_NAME}
7 7
Description: CineForm SDK libraries
8 8
URL: https://github.com/gopro/cineform-sdk
9 9
Version: ${PROJECT_VERSION}
10 -
Libs: -L${LIB_INSTALL_DIR} -lCFHDCodec ${ADDITIONAL_LIBS}
10 +
Libs: -L${LIB_INSTALL_DIR} ${LIB_INSTALL_NAMES} ${ADDITIONAL_LIBS}
11 11
Cflags: -I${INCLUDE_INSTALL_DIR}
You can’t perform that action at this time.
RetroSearch is an open source project built by @garambo | Open a GitHub Issue
Search and Browse the WWW like it's 1997 | Search results from DuckDuckGo
HTML:
3.2
| Encoding:
UTF-8
| Version:
0.7.4