Skip to content

Commit

Permalink
Get cygwin compilation working
Browse files Browse the repository at this point in the history
  • Loading branch information
cehoffman committed Feb 19, 2013
1 parent 5fad956 commit e7774cf
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cpp/BoostParts/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ endif()
# TODO: remove this when it's fixed upstream (probably boost 1.53).
add_definitions( -DBOOST_THREAD_DONT_USE_CHRONO )

if( MSVC )
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 )
Expand Down
7 changes: 6 additions & 1 deletion cpp/ycm/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,11 @@ endif()
# TODO: remove this when it's fixed upstream (probably boost 1.53).
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
Expand Down Expand Up @@ -268,7 +273,7 @@ set_target_properties( ${PROJECT_NAME} PROPERTIES PREFIX "")
# 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
# will recognize a .so
if ( NOT WIN32 )
if ( NOT WIN32 AND NOT CYGWIN )
set_target_properties( ${PROJECT_NAME} PROPERTIES SUFFIX ".so")
endif()

Expand Down

0 comments on commit e7774cf

Please sign in to comment.