Use CMAKE_<LANG>_FLAGS_<CONFIG> and apply fixes

sakertooth · Sep 4, 2023 · 5f0ea81 · 5f0ea81
1 parent ac0fd66
commit 5f0ea81
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -658,8 +658,9 @@ function(add_sanitizer sanitizer supported_compilers want_flag status_flag)
 	if(${want_flag})
 		if(CMAKE_CXX_COMPILER_ID MATCHES ${supported_compilers})
 			set(${status_flag} "Enabled" PARENT_SCOPE)
-			add_compile_options(-fsanitize=${sanitizer})
-			add_link_options(-fsanitize=${sanitizer})
+			# todo CMake 3.13: use add_compile_options/add_link_options instead 
+			set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fsanitize=${sanitizer}" PARENT_SCOPE)
+			set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fsanitize=${sanitizer}" PARENT_SCOPE)
 		else()
 			set(${status_flag} "Wanted but disabled due to unsupported compiler" PARENT_SCOPE)
 		endif()

diff --git a/plugins/LadspaEffect/calf/CMakeLists.txt b/plugins/LadspaEffect/calf/CMakeLists.txt
@@ -38,7 +38,7 @@ SET(INLINE_FLAGS "")
 IF("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
 	SET(INLINE_FLAGS "-finline-functions-called-once -finline-limit=80")
 ENDIF()
-SET_TARGET_PROPERTIES(veal PROPERTIES COMPILE_FLAGS "-fexceptions -O2 -finline-functions ${INLINE_FLAGS}")
+target_compile_options(veal PRIVATE -fexceptions -O2 -finline-functions ${INLINE_FLAGS})
 
 if(LMMS_BUILD_WIN32)
 	add_custom_command(
@@ -50,5 +50,5 @@ if(LMMS_BUILD_WIN32)
 	)
 endif()
 IF(NOT LMMS_BUILD_APPLE AND NOT LMMS_BUILD_OPENBSD)
-	SET_TARGET_PROPERTIES(veal PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined")
+	target_link_libraries(veal PRIVATE -shared -Wl,$<IF:$<PLATFORM_ID:GNU>,-no-undefined,-undefined>)
 ENDIF()
diff --git a/plugins/LadspaEffect/cmt/CMakeLists.txt b/plugins/LadspaEffect/cmt/CMakeLists.txt
@@ -5,7 +5,7 @@ ADD_LIBRARY(cmt MODULE ${SOURCES})
 INSTALL(TARGETS cmt LIBRARY DESTINATION "${PLUGIN_DIR}/ladspa")
 
 SET_TARGET_PROPERTIES(cmt PROPERTIES PREFIX "")
-SET_TARGET_PROPERTIES(cmt PROPERTIES COMPILE_FLAGS "-Wall -O3 -fno-strict-aliasing")
+target_compile_options(cmt PRIVATE -Wall -O3 -fno-strict-aliasing)
 
 if(LMMS_BUILD_WIN32)
 	add_custom_command(
@@ -18,10 +18,10 @@ if(LMMS_BUILD_WIN32)
 endif()
 
 if(NOT LMMS_BUILD_WIN32)
-	set_target_properties(cmt PROPERTIES COMPILE_FLAGS "${COMPILE_FLAGS} -fPIC")
+	target_compile_options(cmt PRIVATE -fPIC)
 endif()
 
 IF(NOT LMMS_BUILD_APPLE AND NOT LMMS_BUILD_OPENBSD)
-	SET_TARGET_PROPERTIES(cmt PROPERTIES LINK_FLAGS "${LINK_FLAGS} -shared -Wl,-no-undefined")
+	target_link_libraries(cmt -shared -Wl,$<IF:$<PLATFORM_ID:GNU>,-no-undefined,-undefined>)
 ENDIF()