forked fromglynos/cpp-netlib
- Notifications
You must be signed in to change notification settings - Fork425
Fixed linker errors in OSX under macports (related issue: 134)#145
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
1 change: 0 additions & 1 deletion.gitignore
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,3 @@ | ||
| *.swp | ||
| *.pyc | ||
| CMakeCache.txt | ||
4 changes: 4 additions & 0 deletionsCMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletionsFindICU.cmake
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| # Finds the International Components for Unicode (ICU) Library | ||
| # | ||
| # ICU_FOUND - True if ICU found. | ||
| # ICU_I18N_FOUND - True if ICU's internationalization library found. | ||
| # ICU_INCLUDE_DIRS - Directory to include to get ICU headers | ||
| # Note: always include ICU headers as, e.g., | ||
| # unicode/utypes.h | ||
| # ICU_LIBRARIES - Libraries to link against for the common ICU | ||
| # ICU_I18N_LIBRARIES - Libraries to link against for ICU internationaliation | ||
| # (note: in addition to ICU_LIBRARIES) | ||
| # Look for the header file. | ||
| find_path( | ||
| ICU_INCLUDE_DIR | ||
| NAMES unicode/utypes.h | ||
| DOC "Include directory for the ICU library") | ||
| mark_as_advanced(ICU_INCLUDE_DIR) | ||
| # Look for the library. | ||
| find_library( | ||
| ICU_LIBRARY | ||
| NAMES icuuc cygicuuc cygicuuc32 | ||
| DOC "Libraries to link against for the common parts of ICU") | ||
| mark_as_advanced(ICU_LIBRARY) | ||
| # Copy the results to the output variables. | ||
| if(ICU_INCLUDE_DIR AND ICU_LIBRARY) | ||
| set(ICU_FOUND 1) | ||
| set(ICU_LIBRARIES ${ICU_LIBRARY}) | ||
| set(ICU_INCLUDE_DIRS ${ICU_INCLUDE_DIR}) | ||
| set(ICU_VERSION 0) | ||
| set(ICU_MAJOR_VERSION 0) | ||
| set(ICU_MINOR_VERSION 0) | ||
| if (EXISTS "${ICU_INCLUDE_DIR}/unicode/uvernum.h") | ||
| FILE(READ "${ICU_INCLUDE_DIR}/unicode/uvernum.h" _ICU_VERSION_CONENTS) | ||
| else() | ||
| FILE(READ "${ICU_INCLUDE_DIR}/unicode/uversion.h" _ICU_VERSION_CONENTS) | ||
| endif() | ||
| STRING(REGEX REPLACE ".*#define U_ICU_VERSION_MAJOR_NUM ([0-9]+).*" "\\1" ICU_MAJOR_VERSION "${_ICU_VERSION_CONENTS}") | ||
| STRING(REGEX REPLACE ".*#define U_ICU_VERSION_MINOR_NUM ([0-9]+).*" "\\1" ICU_MINOR_VERSION "${_ICU_VERSION_CONENTS}") | ||
| set(ICU_VERSION "${ICU_MAJOR_VERSION}.${ICU_MINOR_VERSION}") | ||
| # Look for the ICU internationalization libraries | ||
| find_library( | ||
| ICU_I18N_LIBRARY | ||
| NAMES icuin icui18n cygicuin cygicuin32 | ||
| DOC "Libraries to link against for ICU internationalization") | ||
| mark_as_advanced(ICU_I18N_LIBRARY) | ||
| if (ICU_I18N_LIBRARY) | ||
| set(ICU_I18N_FOUND 1) | ||
| set(ICU_I18N_LIBRARIES ${ICU_I18N_LIBRARY}) | ||
| else (ICU_I18N_LIBRARY) | ||
| set(ICU_I18N_FOUND 0) | ||
| set(ICU_I18N_LIBRARIES) | ||
| endif (ICU_I18N_LIBRARY) | ||
| # Look for the ICU data libraries | ||
| find_library( | ||
| ICU_DATA_LIBRARY | ||
| NAMES icudata cygicudata cygicudata32 | ||
| DOC "Libraries to link against for ICU data") | ||
| mark_as_advanced(ICU_DATA_LIBRARY) | ||
| if (ICU_DATA_LIBRARY) | ||
| set(ICU_DATA_FOUND 1) | ||
| set(ICU_DATA_LIBRARIES ${ICU_DATA_LIBRARY}) | ||
| else (ICU_DATA_LIBRARY) | ||
| set(ICU_DATA_FOUND 0) | ||
| set(ICU_DATA_LIBRARIES) | ||
| endif (ICU_DATA_LIBRARY) | ||
| else(ICU_INCLUDE_DIR AND ICU_LIBRARY) | ||
| set(ICU_FOUND 0) | ||
| set(ICU_I18N_FOUND 0) | ||
| set(ICU_DATA_FOUND 0) | ||
| set(ICU_LIBRARIES) | ||
| set(ICU_I18N_LIBRARIES) | ||
| set(ICU_DATA_LIBRARIES) | ||
| set(ICU_INCLUDE_DIRS) | ||
| set(ICU_VERSION) | ||
| set(ICU_MAJOR_VERSION) | ||
| set(ICU_MINOR_VERSION) | ||
| endif(ICU_INCLUDE_DIR AND ICU_LIBRARY) | ||
| IF(ICU_FOUND) | ||
| IF( NOT ICU_FIND_QUIETLY ) | ||
| MESSAGE( STATUS "Found ICU header files in ${ICU_INCLUDE_DIRS}") | ||
| MESSAGE( STATUS "Found ICU libraries: ${ICU_LIBRARIES}") | ||
| ENDIF( NOT ICU_FIND_QUIETLY ) | ||
| ELSE(ICU_FOUND) | ||
| IF(ICU_FIND_REQUIRED) | ||
| MESSAGE( FATAL_ERROR "Could not find ICU" ) | ||
| ELSE(ICU_FIND_REQUIRED) | ||
| MESSAGE( STATUS "Optional package ICU was not found" ) | ||
| ENDIF(ICU_FIND_REQUIRED) | ||
| ENDIF(ICU_FOUND) |
2 changes: 1 addition & 1 deletionlibs/mime/test/CMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
3 changes: 3 additions & 0 deletionslibs/network/test/http/CMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletionlibs/network/test/uri/CMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.