Skip to content

Fix issue #159: Failure when cross-compiling for VxWorks #160

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
moberhuber wants to merge 4 commits into from
Closed

Fix issue #159: Failure when cross-compiling for VxWorks #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de1ffdf
Fix issue #159: Failure when cross-compiling for VxWorks
Oct 21, 2016
fdd2c56
Fix issue #159: Failure when cross-compiling - cosmetic cleanup
Oct 21, 2016
ad32743
Fix issue #163 - Configure fails when libutil is missing
Oct 28, 2016
ef2ddf6
Disable _XOPEN_SOURCE for VxWorks due to #include <sys/select.h> failing
Oct 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion cmake/ConfigureChecks.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,9 @@ if(HAVE_BUILTIN_OPENPTY)
set(HAVE_LIBUTIL 1)
else()
find_library(HAVE_LIBUTIL util)
set(LIBUTIL_LIBRARIES ${HAVE_LIBUTIL})
if(HAVE_LIBUTIL)
set(LIBUTIL_LIBRARIES ${HAVE_LIBUTIL})
endif()
endif()

if(APPLE)
Expand Down Expand Up @@ -540,6 +542,18 @@ elseif(CMAKE_SYSTEM MATCHES "QNX\\-6\\.3\\.2$")
# defining NI_NUMERICHOST.

set(define_xopen_source 0)

elseif(CMAKE_SYSTEM MATCHES "VxWorks\\-7$")

# VxWorks-7

# On VxWorks-7, defining _XOPEN_SOURCE or _POSIX_C_SOURCE
# leads to a failure in select.h because sys/types.h fails
# to define FD_SETSIZE.
# Reported by Martin Oberhuber as V7COR-4651.

set(define_xopen_source 0)

endif()

if(define_xopen_source)
Expand Down
18 changes: 10 additions & 8 deletions cmake/extensions/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
# XXX Because of CMake issue #8170 disable ctypes support when using
# "Visual Studio 2008 Win64" generator.
if("${MSVC_VERSION}" VERSION_EQUAL 1500 AND ${CMAKE_SIZEOF_VOID_P} EQUAL 8)
if(MSVC_VERSION)
# XXX Because of CMake issue #8170 disable ctypes support when using
# "Visual Studio 2008 Win64" generator.
if("${MSVC_VERSION}" VERSION_EQUAL 1500 AND ${CMAKE_SIZEOF_VOID_P} EQUAL 8)
set(warn "Disable 'ctypes' and 'ctypes_test' extensions when using 'Visual Studio 2008 Win64' generator. See http://public.kitware.com/Bug/view.php?id=8170 for more details.")
if(NOT DEFINED ENABLE_CTYPES OR ENABLE_CTYPES OR NOT DEFINED ENABLE_CTYPES_TEST OR ENABLE_CTYPES_TEST)
message(WARNING ${warn})
endif()
set(ENABLE_CTYPES OFF CACHE BOOL "${warn}" FORCE)
set(ENABLE_CTYPES_TEST OFF CACHE BOOL "${warn}" FORCE)
endif()
# XXX Because of CMake issue #11536, disable ctypes support when using
# CMake < 2.8.12 with "Visual Studio 2010" and "Visual Studio 2010 Win64"
# generator.
if(CMAKE_VERSION VERSION_LESS 2.8.12)
endif()
# XXX Because of CMake issue #11536, disable ctypes support when using
# CMake < 2.8.12 with "Visual Studio 2010" and "Visual Studio 2010 Win64"
# generator.
if(CMAKE_VERSION VERSION_LESS 2.8.12)
if("${MSVC_VERSION}" VERSION_EQUAL 1600)
set(warn "Disable 'ctypes' and 'ctypes_test' extensions when using CMake < 2.8.12 with any 'Visual Studio 2010' generators. See http://public.kitware.com/Bug/view.php?id=11536 for more details.")
if(NOT DEFINED ENABLE_CTYPES OR ENABLE_CTYPES OR NOT DEFINED ENABLE_CTYPES_TEST OR ENABLE_CTYPES_TEST)
Expand All @@ -20,6 +21,7 @@ if(CMAKE_VERSION VERSION_LESS 2.8.12)
set(ENABLE_CTYPES OFF CACHE BOOL "${warn}" FORCE)
set(ENABLE_CTYPES_TEST OFF CACHE BOOL "${warn}" FORCE)
endif()
endif()
endif()

set(WIN32_BUILTIN )
Expand Down