Skip to content

Commit

Permalink
CMake language correction: CXX --> C
Browse files Browse the repository at this point in the history
  • Loading branch information
weinrank committed Sep 3, 2015
1 parent 71a8887 commit 25c5153
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions programs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -174,15 +174,15 @@ FOREACH (source_file ${check_PROGRAMS})

ADD_TEST (${source_file_we} ${source_file_we})

IF ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang" OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xGNU")
IF ("x${CMAKE_C_COMPILER_ID}" STREQUAL "xClang" OR "x${CMAKE_C_COMPILER_ID}" STREQUAL "xGNU")
SET_PROPERTY (TARGET ${source_file_we} APPEND_STRING PROPERTY COMPILE_FLAGS "-g -pedantic -Wall -Werror -std=c99")
ENDIF ()

IF ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
STRING(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
IF ("x${CMAKE_C_COMPILER_ID}" STREQUAL "xMSVC")
IF (CMAKE_C_FLAGS MATCHES "/W[0-4]")
STRING(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
ELSE ()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W4")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W4")
ENDIF ()
ENDIF ()
ENDFOREACH ()
14 changes: 7 additions & 7 deletions usrsctplib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -237,20 +237,20 @@ SET_TARGET_PROPERTIES (usrsctp-static PROPERTIES OUTPUT_NAME "usrsctp")
SET_TARGET_PROPERTIES (usrsctp PROPERTIES IMPORT_SUFFIX "_import.lib")
SET_TARGET_PROPERTIES (usrsctp PROPERTIES SOVERSION 1 VERSION 1.0.0)

IF ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xClang" OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xGNU")
IF ("x${CMAKE_C_COMPILER_ID}" STREQUAL "xClang" OR "x${CMAKE_C_COMPILER_ID}" STREQUAL "xGNU")
SET_PROPERTY (TARGET usrsctp APPEND_STRING PROPERTY COMPILE_FLAGS "-g -pedantic -Wall -Werror -std=c99") #
SET_PROPERTY (TARGET usrsctp-static APPEND_STRING PROPERTY COMPILE_FLAGS "-g -pedantic -Wall -Werror -std=c99") #
ENDIF ()
IF ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC")
IF (CMAKE_CXX_FLAGS MATCHES "/W[0-4]")
STRING(REGEX REPLACE "/W[0-4]" "/W3" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
IF ("x${CMAKE_C_COMPILER_ID}" STREQUAL "xMSVC")
IF (CMAKE_C_FLAGS MATCHES "/W[0-4]")
STRING(REGEX REPLACE "/W[0-4]" "/W3" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
ELSE ()
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /W3")
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /W3")
ENDIF ()
ENDIF ()

IF ("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC90" OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC10")
SET_SOURCE_FILES_PROPERTIES(${usrsctp_SOURCES} PROPERTIES LANGUAGE CXX)
IF ("x${CMAKE_C_COMPILER_ID}" STREQUAL "xMSVC90" OR "x${CMAKE_C_COMPILER_ID}" STREQUAL "xMSVC10")
SET_SOURCE_FILES_PROPERTIES(${usrsctp_SOURCES} PROPERTIES LANGUAGE C)
ENDIF()

IF (NOT DEFINED CMAKE_INSTALL_LIBDIR)
Expand Down

0 comments on commit 25c5153

Please sign in to comment.