|
@@ -75,9 +75,9 @@ foreach (TARGET ${STATIC_LIBRARY_TARGETS})
|
|
|
|
|
|
|
|
foreach (SOURCE ${SOURCES})
|
|
foreach (SOURCE ${SOURCES})
|
|
|
get_filename_component (NAME ${SOURCE} NAME)
|
|
get_filename_component (NAME ${SOURCE} NAME)
|
|
|
- if (NAME MATCHES \\.c.*$|\\.m$|\\.S$)
|
|
|
|
|
|
|
+ if (NAME MATCHES \\.c.*$|\\.mm?$|\\.S$|\\.s$)
|
|
|
if (MSVC OR XCODE)
|
|
if (MSVC OR XCODE)
|
|
|
- string (REGEX REPLACE \\.c.*$|\\.m$|\\.S$ "" NAME ${NAME})
|
|
|
|
|
|
|
+ string (REGEX REPLACE \\.c.*$|\\.mm?$|\\.S$|\\.s$ "" NAME ${NAME})
|
|
|
endif ()
|
|
endif ()
|
|
|
set (SYS_DIR "")
|
|
set (SYS_DIR "")
|
|
|
if (NOT MSVC AND NOT XCODE)
|
|
if (NOT MSVC AND NOT XCODE)
|