Skip to content

Commit

Permalink
Merge pull request ycm-core#432 from socketwiz/master
Browse files Browse the repository at this point in the history
build error on SmartOS
  • Loading branch information
Valloric committed Jul 12, 2013
2 parents f9acf56 + e6cb81a commit 7659a7b
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 0 deletions.
5 changes: 5 additions & 0 deletions cpp/BoostParts/CMakeLists.txt
Expand Up @@ -118,3 +118,8 @@ if( MSVC )
set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /Oi /GL" )
set_target_properties( ${PROJECT_NAME} PROPERTIES STATIC_LIBRARY_FLAGS "/LTCG" )
endif()

if( SYSTEM_IS_SUNOS )
# SunOS needs this setting for thread support
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthreads" )
endif()
4 changes: 4 additions & 0 deletions cpp/CMakeLists.txt
Expand Up @@ -28,6 +28,10 @@ if ( ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD" )
set( SYSTEM_IS_FREEBSD true )
endif()

if ( ${CMAKE_SYSTEM_NAME} MATCHES "SunOS" )
set( SYSTEM_IS_SUNOS true )
endif()

# Check if platform is 64 bit
if( CMAKE_SIZEOF_VOID_P EQUAL 4 )
set( 64_BIT_PLATFORM 0 )
Expand Down
5 changes: 5 additions & 0 deletions cpp/ycm/CMakeLists.txt
Expand Up @@ -313,4 +313,9 @@ endif()

#############################################################################

if( SYSTEM_IS_SUNOS )
# SunOS needs this setting for thread support
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthreads" )
endif()

add_subdirectory( tests )

0 comments on commit 7659a7b

Please sign in to comment.