vim/YouCompleteMe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #122 from cehoffman/cygwin_support

Browse Source 
Get cygwin compilation working
This commit is contained in:
Val Markovic 2013-02-19 00:13:41 -08:00
commit 3a285e8a31
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpp/BoostParts/CMakeLists.txt
View File

@ -86,7 +86,7 @@ endif()
# TODO: remove this when it's fixed upstream (probably boost 1.53). # TODO: remove this when it's fixed upstream (probably boost 1.53).
add_definitions( -DBOOST_THREAD_DONT_USE_CHRONO ) add_definitions( -DBOOST_THREAD_DONT_USE_CHRONO )
if( MSVC ) if( MSVC OR CYGWIN )
# BOOST_PYTHON_SOURCE makes boost use the correct __declspec and # BOOST_PYTHON_SOURCE makes boost use the correct __declspec and
# BOOST_ALL_NO_LIB turns off MSVC library autolinking # BOOST_ALL_NO_LIB turns off MSVC library autolinking
add_definitions( -DBOOST_PYTHON_SOURCE -DBOOST_ALL_NO_LIB ) add_definitions( -DBOOST_PYTHON_SOURCE -DBOOST_ALL_NO_LIB )

7
cpp/ycm/CMakeLists.txt
View File

@ -223,6 +223,11 @@ endif()
# TODO: remove this when it's fixed upstream (probably boost 1.53). # TODO: remove this when it's fixed upstream (probably boost 1.53).
add_definitions( -DBOOST_THREAD_DONT_USE_CHRONO ) add_definitions( -DBOOST_THREAD_DONT_USE_CHRONO )
if( MSVC OR CYGWIN )
# BOOST_PYTHON_SOURCE makes boost use the correct __declspec and
# BOOST_ALL_NO_LIB turns off MSVC library autolinking
add_definitions( -DBOOST_PYTHON_SOURCE -DBOOST_ALL_NO_LIB )
endif()
############################################################################# #############################################################################
add_library( ${PROJECT_NAME} SHARED add_library( ${PROJECT_NAME} SHARED
@ -274,7 +279,7 @@ set_target_properties( ${PROJECT_NAME} PROPERTIES PREFIX "")
# Even on macs, we want a .so extension instead of a .dylib which is what cmake # Even on macs, we want a .so extension instead of a .dylib which is what cmake
# would give us by default. Python won't recognize a .dylib as a module, but it # would give us by default. Python won't recognize a .dylib as a module, but it
# will recognize a .so # will recognize a .so
if ( NOT WIN32 ) if ( NOT WIN32 AND NOT CYGWIN )
set_target_properties( ${PROJECT_NAME} PROPERTIES SUFFIX ".so") set_target_properties( ${PROJECT_NAME} PROPERTIES SUFFIX ".so")
endif() endif()

2
plugin/youcompleteme.vim
View File

@ -39,6 +39,8 @@ function! s:HasYcmCore()
let path_prefix = s:script_folder_path . '/../python/' let path_prefix = s:script_folder_path . '/../python/'
if filereadable(path_prefix . 'ycm_core.so') if filereadable(path_prefix . 'ycm_core.so')
return 1 return 1
elseif filereadable(path_prefix . 'ycm_core.dll')
return 1
elseif filereadable(path_prefix . 'ycm_core.pyd') elseif filereadable(path_prefix . 'ycm_core.pyd')
return 1 return 1
endif endif