[svn-r23959] Bring revisions #23745 - 23862 from trunk to revise_chunks.

h5committested.
This commit is contained in:
Vailin Choi
2013-07-31 18:49:47 -05:00
parent 3146ddb5c2
commit e78fbfd2a2
121 changed files with 956 additions and 428 deletions

View File

@@ -132,7 +132,7 @@ MACRO (TARGET_C_PROPERTIES wintarget addcompileflags addlinkflags)
LINK_FLAGS "${addlinkflags}"
)
ELSE (BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES (${forttarget}
SET_TARGET_PROPERTIES (${wintarget}
PROPERTIES
COMPILE_FLAGS "${addcompileflags}"
LINK_FLAGS "${addlinkflags}"
@@ -147,14 +147,14 @@ MACRO (TARGET_MSVC_PROPERTIES wintarget addcompileflags addlinkflags)
IF (BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES (${wintarget}
PROPERTIES
COMPILE_FLAGS "/dll ${addcompileflags}"
LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}"
COMPILE_FLAGS "${addcompileflags}"
LINK_FLAGS "${addlinkflags}"
)
ELSE (BUILD_SHARED_LIBS)
SET_TARGET_PROPERTIES (${forttarget}
SET_TARGET_PROPERTIES (${wintarget}
PROPERTIES
COMPILE_FLAGS "${addcompileflags}"
LINK_FLAGS "/SUBSYSTEM:CONSOLE ${addlinkflags}"
LINK_FLAGS "${addlinkflags}"
)
ENDIF (BUILD_SHARED_LIBS)
ENDIF (MSVC)