aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcodicodi <rob.ceglinski@gmail.com>2016-12-05 13:32:11 +0100
committerGitHub <noreply@github.com>2016-12-05 13:32:11 +0100
commit58c6c686a6526a83014476e0ae71875536b2096b (patch)
treeada5363047ebc69d82be2816df416e2cf01db72a
parent6e3b500a827b3a85e47c3c37047660f3cb369a8f (diff)
downloadvcpkg-58c6c686a6526a83014476e0ae71875536b2096b.tar.gz
vcpkg-58c6c686a6526a83014476e0ae71875536b2096b.zip
[nana] fix harmless but still ugly mix-up
-rw-r--r--ports/nana/fix-linking.patch6
1 files changed, 3 insertions, 3 deletions
diff --git a/ports/nana/fix-linking.patch b/ports/nana/fix-linking.patch
index 08ab58151..a687e228b 100644
--- a/ports/nana/fix-linking.patch
+++ b/ports/nana/fix-linking.patch
@@ -1,5 +1,5 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c9c9c9..8376431 100644
+index 5c9c9c9..ae35185 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -149,26 +149,20 @@ endif ()
@@ -41,10 +41,10 @@ index 5c9c9c9..8376431 100644
add_library(${PROJECT_NAME} ${sources} )
-target_link_libraries(${PROJECT_NAME} ${NANA_LINKS})
+if(NANA_CMAKE_ENABLE_JPEG AND NANA_CMAKE_LIBJPEG_FROM_OS)
-+ target_link_libraries(${PROJECT_NAME} ${PNG_LIBRARIES})
++ target_link_libraries(${PROJECT_NAME} ${JPEG_LIBRARIES})
+endif()
+if(NANA_CMAKE_ENABLE_PNG AND NANA_CMAKE_LIBPNG_FROM_OS)
-+ target_link_libraries(${PROJECT_NAME} ${JPEG_LIBRARIES})
++ target_link_libraries(${PROJECT_NAME} ${PNG_LIBRARIES})
+endif()
# Headers: use INCLUDE_DIRECTORIES