diff options
| author | Martin Müller <muemart@users.noreply.github.com> | 2017-05-05 11:42:36 +0200 |
|---|---|---|
| committer | Martin Müller <muemart@users.noreply.github.com> | 2017-05-05 11:45:04 +0200 |
| commit | 1c70d26ad1ad53c4afd53cc9c4ef729227e72c24 (patch) | |
| tree | 2f9f0337a778b3e882aa85e8e6477950f09d9d57 /ports/nana/fix-linking.patch | |
| parent | 63c613f1ed7fb9a16f0d63cb351c711730e263bf (diff) | |
| download | vcpkg-1c70d26ad1ad53c4afd53cc9c4ef729227e72c24.tar.gz vcpkg-1c70d26ad1ad53c4afd53cc9c4ef729227e72c24.zip | |
Force LF line endings for patch files
Diffstat (limited to 'ports/nana/fix-linking.patch')
| -rw-r--r-- | ports/nana/fix-linking.patch | 102 |
1 files changed, 51 insertions, 51 deletions
diff --git a/ports/nana/fix-linking.patch b/ports/nana/fix-linking.patch index a687e228b..f897ed228 100644 --- a/ports/nana/fix-linking.patch +++ b/ports/nana/fix-linking.patch @@ -1,51 +1,51 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5c9c9c9..ae35185 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -149,26 +149,20 @@ endif ()
- # Find PNG
- if(NANA_CMAKE_ENABLE_PNG)
- add_definitions(-DNANA_ENABLE_PNG)
-- set(NANA_LINKS "${NANA_LINKS} -lpng")
- if(NANA_CMAKE_LIBPNG_FROM_OS)
-- find_package(PNG)
-- if (PNG_FOUND)
-- include_directories( ${PNG_INCLUDE_DIRS})
-- add_definitions(-DUSE_LIBPNG_FROM_OS)
-- endif(PNG_FOUND)
-+ find_package(PNG REQUIRED)
-+ include_directories(${PNG_INCLUDE_DIRS})
-+ add_definitions(-DUSE_LIBPNG_FROM_OS)
- endif(NANA_CMAKE_LIBPNG_FROM_OS)
- endif(NANA_CMAKE_ENABLE_PNG)
-
- # Find JPEG
- if(NANA_CMAKE_ENABLE_JPEG)
- add_definitions(-DNANA_ENABLE_JPEG)
-- set(NANA_LINKS "${NANA_LINKS} -ljpeg")
- if(NANA_CMAKE_LIBJPEG_FROM_OS)
-- find_package(JPEG)
-- if (JPEG_FOUND)
-- include_directories( ${JPEG_INCLUDE_DIRS})
-- add_definitions(-DUSE_LIBJPEG_FROM_OS)
-- endif(JPEG_FOUND)
-+ find_package(JPEG REQUIRED)
-+ include_directories(${JPEG_INCLUDE_DIRS})
-+ add_definitions(-DUSE_LIBJPEG_FROM_OS)
- endif(NANA_CMAKE_LIBJPEG_FROM_OS)
- endif(NANA_CMAKE_ENABLE_JPEG)
-
-@@ -253,7 +247,12 @@ endforeach(subdir ${NANA_SOURCE_SUBDIRS})
-
- include_directories(${NANA_INCLUDE_DIR})
- 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} ${JPEG_LIBRARIES})
-+endif()
-+if(NANA_CMAKE_ENABLE_PNG AND NANA_CMAKE_LIBPNG_FROM_OS)
-+ target_link_libraries(${PROJECT_NAME} ${PNG_LIBRARIES})
-+endif()
-
- # Headers: use INCLUDE_DIRECTORIES
- # Libraries: use FIND_LIBRARY and link with the result of it (try to avoid LINK_DIRECTORIES)
+diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c9c9c9..ae35185 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -149,26 +149,20 @@ endif () + # Find PNG + if(NANA_CMAKE_ENABLE_PNG) + add_definitions(-DNANA_ENABLE_PNG) +- set(NANA_LINKS "${NANA_LINKS} -lpng") + if(NANA_CMAKE_LIBPNG_FROM_OS) +- find_package(PNG) +- if (PNG_FOUND) +- include_directories( ${PNG_INCLUDE_DIRS}) +- add_definitions(-DUSE_LIBPNG_FROM_OS) +- endif(PNG_FOUND) ++ find_package(PNG REQUIRED) ++ include_directories(${PNG_INCLUDE_DIRS}) ++ add_definitions(-DUSE_LIBPNG_FROM_OS) + endif(NANA_CMAKE_LIBPNG_FROM_OS) + endif(NANA_CMAKE_ENABLE_PNG) + + # Find JPEG + if(NANA_CMAKE_ENABLE_JPEG) + add_definitions(-DNANA_ENABLE_JPEG) +- set(NANA_LINKS "${NANA_LINKS} -ljpeg") + if(NANA_CMAKE_LIBJPEG_FROM_OS) +- find_package(JPEG) +- if (JPEG_FOUND) +- include_directories( ${JPEG_INCLUDE_DIRS}) +- add_definitions(-DUSE_LIBJPEG_FROM_OS) +- endif(JPEG_FOUND) ++ find_package(JPEG REQUIRED) ++ include_directories(${JPEG_INCLUDE_DIRS}) ++ add_definitions(-DUSE_LIBJPEG_FROM_OS) + endif(NANA_CMAKE_LIBJPEG_FROM_OS) + endif(NANA_CMAKE_ENABLE_JPEG) + +@@ -253,7 +247,12 @@ endforeach(subdir ${NANA_SOURCE_SUBDIRS}) + + include_directories(${NANA_INCLUDE_DIR}) + 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} ${JPEG_LIBRARIES}) ++endif() ++if(NANA_CMAKE_ENABLE_PNG AND NANA_CMAKE_LIBPNG_FROM_OS) ++ target_link_libraries(${PROJECT_NAME} ${PNG_LIBRARIES}) ++endif() + + # Headers: use INCLUDE_DIRECTORIES + # Libraries: use FIND_LIBRARY and link with the result of it (try to avoid LINK_DIRECTORIES) |