CMake cleanup and fixes

cmake/SDL.cmake

@@ -59,5 +59,5 @@ elseif(MSVC AND ${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
     set(CMAKE_CCXX_FLAGS "/guard:cf")
 endif()
 
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CMAKE_CCXX_FLAGS}")
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CCXX_FLAGS}")
+append(CMAKE_C_FLAGS "${CMAKE_CCXX_FLAGS}")
+append(CMAKE_CXX_FLAGS "${CMAKE_CCXX_FLAGS}")

cmake/platform.cmake

@@ -158,8 +158,6 @@ elseif(UNIX OR MINGW)
         # disable optimizations in debug mode
         append(CMAKE_CXX_FLAGS_DEBUG "-O0")
     endif()
-    # disable assertions
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG")
 endif()
 
 if(WIN32)
@@ -186,6 +184,9 @@ if(DNNL_ARCH_OPT_FLAGS STREQUAL "HostOpts")
     set(DNNL_ARCH_OPT_FLAGS "${DEF_ARCH_OPT_FLAGS}")
 endif()
 
+append(CMAKE_C_FLAGS "${CMAKE_CCXX_FLAGS}")
+append(CMAKE_CXX_FLAGS "${CMAKE_CCXX_FLAGS}")
+
 if(APPLE)
     append(CMAKE_CXX_FLAGS "-mmacosx-version-min=10.7") # makes sure code runs on older macOS versions
     append(CMAKE_CXX_FLAGS "-stdlib=libc++")            # link against libc++ which supports C++11 features

src/CMakeLists.txt

@@ -24,6 +24,10 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/common
     )
 
+# propagate optimization flags
+append(CMAKE_C_FLAGS "${DNNL_ARCH_OPT_FLAGS}")
+append(CMAKE_CXX_FLAGS "${DNNL_ARCH_OPT_FLAGS}")
+
 # propagate SRC specific flags
 append(CMAKE_C_FLAGS "${CMAKE_SRC_CCXX_FLAGS}")
 append(CMAKE_CXX_FLAGS "${CMAKE_SRC_CCXX_FLAGS}")
@@ -82,8 +86,6 @@ set_property(TARGET ${LIB_NAME} PROPERTY VERSION "${DNNL_VERSION_MAJOR}.${DNNL_V
 set_property(TARGET ${LIB_NAME} PROPERTY SOVERSION "${DNNL_VERSION_MAJOR}")
 set_property(TARGET ${LIB_NAME} PROPERTY PUBLIC_HEADER ${HEADERS})
 
-set_target_properties(${LIB_NAME} PROPERTIES COMPILE_FLAGS "${DNNL_ARCH_OPT_FLAGS}")
-
 target_include_directories(${LIB_NAME} PUBLIC
     $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/../include>

src/common/CMakeLists.txt

@@ -23,7 +23,6 @@ file(GLOB_RECURSE SOURCES
 
 set(OBJ_LIB ${LIB_NAME}_common)
 add_library(${OBJ_LIB} OBJECT ${SOURCES})
-set_target_properties(${OBJ_LIB} PROPERTIES COMPILE_FLAGS "${DNNL_ARCH_OPT_FLAGS}")
 target_link_libraries_build(${OBJ_LIB}
     "${EXTRA_SHARED_LIBS};${EXTRA_STATIC_LIBS}")
 set(${LIB_NAME}_SUB_OBJS ${${LIB_NAME}_SUB_OBJS}

src/cpu/CMakeLists.txt

@@ -127,7 +127,6 @@ endif()
 
 set(OBJ_LIB ${LIB_NAME}_cpu)
 add_library(${OBJ_LIB} OBJECT ${SOURCES})
-set_target_properties(${OBJ_LIB} PROPERTIES COMPILE_FLAGS "${DNNL_ARCH_OPT_FLAGS}")
 target_link_libraries_build(${OBJ_LIB}
     "${EXTRA_SHARED_LIBS};${EXTRA_STATIC_LIBS}")
 set(${LIB_NAME}_SUB_OBJS ${${LIB_NAME}_SUB_OBJS}