Skip to content

Commit aa5a868

Browse files
opdenkampopdenkamp
committed
Merge branch 'master' into release
2 parents 54155ca + 9aca235 commit aa5a868

7 files changed

Lines changed: 38 additions & 46 deletions

File tree

‎project/nsis/libcec-pdb.nsh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Section "libCEC debug symbols" SecPDB
33
SectionIn 1
44

55
SetOutPath "$INSTDIR"
6-
File "${BINARY_SOURCE_DIR}\lib\cec.pdb"
6+
File "${BINARY_SOURCE_DIR}\cec.pdb"
77
File "${BINARY_SOURCE_DIR}\cec-tray.pdb"
88

99
SetOutPath "$INSTDIR\netfx"

‎project/nsis/sections.nsh‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -95,6 +95,7 @@ Section "libCEC for .Net" SecDotNetCore
9595

9696
; Copy binaries
9797
SetOutPath "$INSTDIR\net8.0"
98+
File "${BINARY_SOURCE_DIR}\cec.dll"
9899
File "${BINARY_SOURCE_DIR}\net8.0\LibCecSharpCore.deps.json"
99100
File "${BINARY_SOURCE_DIR}\net8.0\LibCecSharpCore.dll"
100101
File "${BINARY_SOURCE_DIR}\net8.0\LibCecSharpCore.runtimeconfig.json"
@@ -111,6 +112,7 @@ Section "libCEC for .Net Framework" SecDotNet
111112

112113
; Copy binaries
113114
SetOutPath "$INSTDIR\netfx"
115+
File "${BINARY_SOURCE_DIR}\cec.dll"
114116
File "${BINARY_SOURCE_DIR}\LibCecSharp.dll"
115117
File "${BINARY_SOURCE_DIR}\LibCecSharp.xml"
116118
File /nonfatal "${BINARY_SOURCE_DIR}\CecSharpTester.exe"

‎src/cec-client/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ include(CheckCXXSourceCompiles)
1212
include(CheckLibraryExists)
1313
include(CheckIncludeFiles)
1414
include(CheckCXXCompilerFlag)
15+
include(CheckSymbolExists)
1516
include(../../cmake/WindowsDebug.cmake)
1617

1718
check_cxx_compiler_flag("-std=c++11" SUPPORTS_CXX11)

‎src/dotnetlib/LibCecSharp/LibCecSharp.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
101101
</ClCompile>
102102
<Link>
103-
<AdditionalDependencies>$(OutDir)cec-static.lib;$(OutDir)lib\p8-platform.lib;%(AdditionalDependencies)</AdditionalDependencies>
103+
<AdditionalDependencies>$(OutDir)cec.lib;$(OutDir)lib\p8-platform.lib;%(AdditionalDependencies)</AdditionalDependencies>
104104
<GenerateDebugInformation>true</GenerateDebugInformation>
105105
<AssemblyDebug>true</AssemblyDebug>
106106
<TargetMachine>MachineX86</TargetMachine>
@@ -122,7 +122,7 @@
122122
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
123123
</ClCompile>
124124
<Link>
125-
<AdditionalDependencies>$(OutDir)cec-static.lib;$(OutDir)lib\p8-platform.lib;%(AdditionalDependencies)</AdditionalDependencies>
125+
<AdditionalDependencies>$(OutDir)cec.lib;$(OutDir)lib\p8-platform.lib;%(AdditionalDependencies)</AdditionalDependencies>
126126
<GenerateDebugInformation>true</GenerateDebugInformation>
127127
<AssemblyDebug>true</AssemblyDebug>
128128
<TargetMachine>MachineX64</TargetMachine>
@@ -143,7 +143,7 @@
143143
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
144144
</ClCompile>
145145
<Link>
146-
<AdditionalDependencies>$(OutDir)cec-static.lib;$(OutDir)lib\p8-platform.lib;%(AdditionalDependencies)</AdditionalDependencies>
146+
<AdditionalDependencies>$(OutDir)cec.lib;$(OutDir)lib\p8-platform.lib;%(AdditionalDependencies)</AdditionalDependencies>
147147
<TargetMachine>MachineX86</TargetMachine>
148148
</Link>
149149
</ItemDefinitionGroup>
@@ -162,7 +162,7 @@
162162
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
163163
</ClCompile>
164164
<Link>
165-
<AdditionalDependencies>$(OutDir)cec-static.lib;$(OutDir)lib\p8-platform.lib;%(AdditionalDependencies)</AdditionalDependencies>
165+
<AdditionalDependencies>$(OutDir)cec.lib;$(OutDir)lib\p8-platform.lib;%(AdditionalDependencies)</AdditionalDependencies>
166166
</Link>
167167
</ItemDefinitionGroup>
168168
<ItemGroup>

‎src/dotnetlib/LibCecSharpCore/LibCecSharpCore.vcxproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@
9191
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
9292
</ClCompile>
9393
<Link>
94-
<AdditionalDependencies>$(OutDir)..\cec-static.lib;$(OutDir)..\lib\p8-platform.lib;%(AdditionalDependencies)</AdditionalDependencies>
94+
<AdditionalDependencies>$(OutDir)..\cec.lib;$(OutDir)..\lib\p8-platform.lib;%(AdditionalDependencies)</AdditionalDependencies>
9595
</Link>
9696
</ItemDefinitionGroup>
9797
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -103,7 +103,7 @@
103103
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
104104
</ClCompile>
105105
<Link>
106-
<AdditionalDependencies>$(OutDir)..\cec-static.lib;$(OutDir)..\lib\p8-platform.lib;%(AdditionalDependencies)</AdditionalDependencies>
106+
<AdditionalDependencies>$(OutDir)..\cec.lib;$(OutDir)..\lib\p8-platform.lib;%(AdditionalDependencies)</AdditionalDependencies>
107107
</Link>
108108
</ItemDefinitionGroup>
109109
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -115,7 +115,7 @@
115115
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
116116
</ClCompile>
117117
<Link>
118-
<AdditionalDependencies>$(OutDir)..\cec-static.lib;$(OutDir)..\lib\p8-platform.lib;%(AdditionalDependencies)</AdditionalDependencies>
118+
<AdditionalDependencies>$(OutDir)..\cec.lib;$(OutDir)..\lib\p8-platform.lib;%(AdditionalDependencies)</AdditionalDependencies>
119119
</Link>
120120
</ItemDefinitionGroup>
121121
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -127,7 +127,7 @@
127127
<GenerateXMLDocumentationFiles>true</GenerateXMLDocumentationFiles>
128128
</ClCompile>
129129
<Link>
130-
<AdditionalDependencies>$(OutDir)..\cec-static.lib;$(OutDir)..\lib\p8-platform.lib;%(AdditionalDependencies)</AdditionalDependencies>
130+
<AdditionalDependencies>$(OutDir)..\cec.lib;$(OutDir)..\lib\p8-platform.lib;%(AdditionalDependencies)</AdditionalDependencies>
131131
</Link>
132132
</ItemDefinitionGroup>
133133
<ItemGroup>

‎src/libcec/CMakeLists.txt‎

Lines changed: 23 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -191,56 +191,45 @@ install(FILES ${PROJECT_SOURCE_DIR}/../../include/cec.h
191191
# external dependencies
192192
include(cmake/LinkPlatformSupport.cmake)
193193

194-
# libCEC shared target
195194
set(libsrc ${CEC_SOURCES})
196195
add_library(libobj OBJECT ${libsrc})
197196
set_property(TARGET libobj PROPERTY POSITION_INDEPENDENT_CODE 1)
197+
198+
198199
add_library(cec-shared SHARED $<TARGET_OBJECTS:libobj>)
199-
add_library(cec-static STATIC $<TARGET_OBJECTS:libobj>)
200-
install(TARGETS cec-shared cec-static
201-
DESTINATION ${LIB_DESTINATION})
202-
set_target_properties(cec-shared PROPERTIES VERSION ${LIBCEC_VERSION_MAJOR}.${LIBCEC_VERSION_MINOR}.${LIBCEC_VERSION_PATCH}
203-
SOVERSION ${LIBCEC_VERSION_MAJOR}
204-
OUTPUT_NAME cec)
205-
set_target_properties(cec-static PROPERTIES VERSION ${LIBCEC_VERSION_MAJOR}.${LIBCEC_VERSION_MINOR}.${LIBCEC_VERSION_PATCH}
206-
OUTPUT_NAME cec)
200+
set_target_properties(cec-shared PROPERTIES
201+
VERSION ${LIBCEC_VERSION_MAJOR}.${LIBCEC_VERSION_MINOR}.${LIBCEC_VERSION_PATCH}
202+
SOVERSION ${LIBCEC_VERSION_MAJOR}
203+
OUTPUT_NAME cec)
207204
target_link_libraries(cec-shared ${cec_depends})
205+
206+
207+
add_library(cec-static STATIC $<TARGET_OBJECTS:libobj>)
208+
set_target_properties(cec-static PROPERTIES
209+
VERSION ${LIBCEC_VERSION_MAJOR}.${LIBCEC_VERSION_MINOR}.${LIBCEC_VERSION_PATCH}
210+
SOVERSION ${LIBCEC_VERSION_MAJOR}
211+
OUTPUT_NAME cec)
208212
target_link_libraries(cec-static ${cec_depends})
209213

210214
if(WIN32)
211215
if (MSVC)
212216
# generate pdb in release mode too
213-
set_target_properties(cec
214-
PROPERTIES
215-
COMPILE_PDB_NAME_DEBUG cec${CMAKE_DEBUG_POSTFIX}
217+
cmake_policy(SET CMP0141 NEW)
218+
set(CMAKE_MSVC_DEBUG_INFORMATION_FORMAT "$<$<CONFIG:Release,RelWithDebInfo>:ProgramDatabase>")
219+
220+
set_target_properties(cec-shared PROPERTIES
221+
COMPILE_PDB_NAME_DEBUG cec
216222
COMPILE_PDB_NAME_RELEASE cec
217223
COMPILE_PDB_NAME_MINSIZEREL cec
218224
COMPILE_PDB_NAME_RELWITHDEBINFO cec)
219-
endif(MSVC)
220-
221-
# libCEC static target used by .net wrappers
222-
add_library(cec-static STATIC ${CEC_SOURCES})
223-
install(TARGETS cec-static
224-
DESTINATION ${LIB_DESTINATION})
225-
set_target_properties(cec-static PROPERTIES VERSION ${LIBCEC_VERSION_MAJOR}.${LIBCEC_VERSION_MINOR}.${LIBCEC_VERSION_PATCH}
226-
SOVERSION ${LIBCEC_VERSION_MAJOR})
227-
target_link_libraries(cec-static ${cec_depends})
228-
229-
if (MSVC)
230-
# generate pdb in release mode too
231-
set_target_properties(cec-static
232-
PROPERTIES
233-
COMPILE_PDB_NAME_DEBUG cec-static${CMAKE_DEBUG_POSTFIX}
234-
COMPILE_PDB_NAME_RELEASE cec-static
235-
COMPILE_PDB_NAME_MINSIZEREL cec-static
236-
COMPILE_PDB_NAME_RELWITHDEBINFO cec-static)
237225

238226
# install generated pdb
239-
install(FILES $<TARGET_FILE_DIR:cec>/cec.pdb
240-
DESTINATION "${CMAKE_INSTALL_LIBDIR}")
241-
install(FILES $<TARGET_FILE_DIR:cec-static>/cec-static.pdb
242-
DESTINATION "${CMAKE_INSTALL_LIBDIR}")
227+
install(FILES $<TARGET_FILE_DIR:cec-shared>/cec.pdb
228+
DESTINATION ${LIB_DESTINATION})
243229
endif(MSVC)
244230
endif(WIN32)
245231

232+
install(TARGETS cec-shared cec-static
233+
DESTINATION ${LIB_DESTINATION})
234+
246235
include(cmake/DisplayPlatformSupport.cmake)

‎windows/build-all.cmd‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ IF "%1" == "" (
2222
SET BUILDARCH=%1
2323
)
2424

25-
rem optional parameter: build type (Release)
25+
rem optional parameter: build type (RelWithDebInfo)
2626
IF "%2" == "" (
27-
SET BUILDTYPE=Release
27+
SET BUILDTYPE=RelWithDebInfo
2828
) ELSE (
2929
SET BUILDTYPE=%2
3030
)
@@ -59,7 +59,7 @@ IF NOT EXIST "%BUILDPATH%" (
5959
rem Compile libCEC
6060
CD "%MYDIR%..\project"
6161
ECHO. * compiling release libCEC libraries for %BUILDARCH%
62-
CALL "%MYDIR%build-lib.cmd" %BUILDARCH% Release %VSVERSION% "%BUILDPATH%\Release" nmake
62+
CALL "%MYDIR%build-lib.cmd" %BUILDARCH% RelWithDebInfo %VSVERSION% "%BUILDPATH%\Release" nmake
6363
IF %errorlevel% neq 0 (
6464
ECHO. *** failed to build libCEC for %BUILDARCH% ***
6565
PAUSE

0 commit comments

Comments
 (0)