ENH: Remove CMAKE_ANSI_CFLAGS variable and instead always add ansi flags to CMAKE_C_COMPILE_OBJECT. We should not require every project to reference CMAKE_ANSI_CFLAGS.
This commit is contained in:
parent
ac0e58dcfb
commit
5a834b0bb0
|
@ -42,7 +42,6 @@ IF(CMAKE_COMPILER_IS_GNUCC)
|
||||||
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") # -pic
|
SET(CMAKE_SHARED_LIBRARY_C_FLAGS "-fPIC") # -pic
|
||||||
ELSE(CMAKE_COMPILER_IS_GNUCC)
|
ELSE(CMAKE_COMPILER_IS_GNUCC)
|
||||||
# hp cc
|
# hp cc
|
||||||
SET(CMAKE_ANSI_CFLAGS "-Aa -Ae")
|
|
||||||
# use ld directly to create shared libraries for hp cc
|
# use ld directly to create shared libraries for hp cc
|
||||||
SET(CMAKE_C_CREATE_SHARED_LIBRARY
|
SET(CMAKE_C_CREATE_SHARED_LIBRARY
|
||||||
"ld <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_C_FLAG><TARGET_SONAME> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
|
"ld <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> <CMAKE_SHARED_LIBRARY_SONAME_C_FLAG><TARGET_SONAME> <LINK_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
|
||||||
|
@ -53,6 +52,9 @@ ELSE(CMAKE_COMPILER_IS_GNUCC)
|
||||||
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") # : or empty
|
SET(CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG_SEP ":") # : or empty
|
||||||
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "+h")
|
SET(CMAKE_SHARED_LIBRARY_SONAME_C_FLAG "+h")
|
||||||
SET(CMAKE_EXECUTABLE_RUNTIME_C_FLAG "-Wl,+b") # -rpath
|
SET(CMAKE_EXECUTABLE_RUNTIME_C_FLAG "-Wl,+b") # -rpath
|
||||||
|
SET(CMAKE_C_FLAGS_INIT "")
|
||||||
|
SET(CMAKE_C_COMPILE_OBJECT
|
||||||
|
"<CMAKE_C_COMPILER> <DEFINES> -Aa -Ae <FLAGS> -o <OBJECT> -c <SOURCE>")
|
||||||
ENDIF(CMAKE_COMPILER_IS_GNUCC)
|
ENDIF(CMAKE_COMPILER_IS_GNUCC)
|
||||||
|
|
||||||
# CXX compiler
|
# CXX compiler
|
||||||
|
@ -79,7 +81,6 @@ ELSE(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "+O3 -DNDEBUG")
|
SET (CMAKE_CXX_FLAGS_MINSIZEREL_INIT "+O3 -DNDEBUG")
|
||||||
SET (CMAKE_CXX_FLAGS_RELEASE_INIT "+O2 -DNDEBUG")
|
SET (CMAKE_CXX_FLAGS_RELEASE_INIT "+O2 -DNDEBUG")
|
||||||
SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-g")
|
SET (CMAKE_CXX_FLAGS_RELWITHDEBINFO_INIT "-g")
|
||||||
SET (CMAKE_C_FLAGS_INIT "")
|
|
||||||
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
||||||
# set flags for gcc support
|
# set flags for gcc support
|
||||||
INCLUDE(Platform/UnixPaths)
|
INCLUDE(Platform/UnixPaths)
|
||||||
|
|
Loading…
Reference in New Issue