diff options
| author | Silvio <silvio.traversaro@iit.it> | 2016-11-16 23:09:42 +0100 |
|---|---|---|
| committer | Silvio <silvio.traversaro@iit.it> | 2016-11-16 23:09:42 +0100 |
| commit | 50d52d49bca2c67cf8982c58977f7b7c3b3ccde6 (patch) | |
| tree | 806d7e76f20af607540d4f2d7ec75febacbd487a | |
| parent | 009378acceee049bef769451aa790c453a9f2a19 (diff) | |
| download | vcpkg-50d52d49bca2c67cf8982c58977f7b7c3b3ccde6.tar.gz vcpkg-50d52d49bca2c67cf8982c58977f7b7c3b3ccde6.zip | |
[jxrlib] Add debug postfix and do not install SKD header
Add a debug postfix to jxrlib, to simplify
finding the debug library in CMake, consistently
with most other libraries in vcpkg.
Do not use or install guiddef.h, that is an header
of Windows SDK of which jxrlib includes a copy for
non-Windows platforms.
| -rw-r--r-- | ports/jxrlib/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | ports/jxrlib/portfile.cmake | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ports/jxrlib/CMakeLists.txt b/ports/jxrlib/CMakeLists.txt index e1df20dad..d9ac84fb6 100644 --- a/ports/jxrlib/CMakeLists.txt +++ b/ports/jxrlib/CMakeLists.txt @@ -8,6 +8,9 @@ project(jxrlib C) # Need shared libs for ABI option(BUILD_SHARED_LIBS "Build shared libraries" ON) +# Add a debug postfix +set(CMAKE_DEBUG_POSTFIX "d") + # helper macro to preserve original Makefile convention macro(JXR_MAKE_OBJ SET_NAME) foreach(src ${SRC_${SET_NAME}}) diff --git a/ports/jxrlib/portfile.cmake b/ports/jxrlib/portfile.cmake index 914adf14e..57c9dc1fe 100644 --- a/ports/jxrlib/portfile.cmake +++ b/ports/jxrlib/portfile.cmake @@ -9,6 +9,10 @@ vcpkg_extract_source_archive(${ARCHIVE}) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) +# The file guiddef.h is part of the Windows SDK, +# we then remove the local copy shipped with jxrlib +file(REMOVE ${SOURCE_PATH}/common/include/guiddef.h) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} OPTIONS -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS:BOOL=ON |