@@ -70,7 +70,7 @@ SET(EDIT_WARNING_MESSAGE "Please do not edit this file - it is generated by cmak
70
70
CONFIGURE_FILE (${CMAKE_SOURCE_DIR} /driver/version_info.h.cmake
71
71
${CMAKE_BINARY_DIR} /driver/version_info.h @ONLY )
72
72
73
- # This is needed by windows installer and fro CPACK
73
+ # This is needed by windows installer and for CPACK
74
74
IF (EXISTS "${CMAKE_SOURCE_DIR} /LICENSE.mysql" )
75
75
SET (LICENSE_FILENAME "${CMAKE_SOURCE_DIR} /LICENSE.mysql" )
76
76
ELSE (EXISTS "${CMAKE_SOURCE_DIR} /LICENSE.mysql" )
@@ -139,6 +139,13 @@ ENDIF()
139
139
#-----------------
140
140
# CPPFLAGS, CXXFLAGS and LDFLAGS from the environment
141
141
142
+ #
143
+ # Note: Currently it is assumed that the basic compile/link flags that
144
+ # are required for Solaris SunPro C++ compiler are set in CMAKE_CXX_FLAGS
145
+ # when running cmake. This is what happens when the legacy connector build
146
+ # is initiated from jdbc.cmake during main connector configuration.
147
+ #
148
+
142
149
SET (FreeBSD11Up False )
143
150
if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD" AND
144
151
${CMAKE_SYSTEM_VERSION} GREATER "10" )
@@ -539,6 +546,12 @@ if(NOT MAINTAINER_MODE)
539
546
/wd4706 # assignment within conditional expression
540
547
)
541
548
549
+ elseif (CMAKE_CXX_COMPILER_ID MATCHES "SunPro" )
550
+
551
+ add_compile_options (
552
+ -erroff=wvarhidemem
553
+ )
554
+
542
555
else ()
543
556
544
557
add_compile_options (
@@ -549,6 +562,13 @@ if(NOT MAINTAINER_MODE)
549
562
endif ()
550
563
endif ()
551
564
565
+ if (CMAKE_CXX_COMPILER_ID MATCHES "SunPro" )
566
+ add_compile_options (
567
+ -errtags=yes # show tags that can be used to disable warnings
568
+ )
569
+ endif ()
570
+
571
+
552
572
ADD_SUBDIRECTORY (cppconn )
553
573
ADD_SUBDIRECTORY (driver )
554
574
0 commit comments