Attempt to fix linking

tresf · May 25, 2024 · 1a1474f · 1a1474f
1 parent 6210c99
commit 1a1474f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/cmake/modules/DetectMachine.cmake b/cmake/modules/DetectMachine.cmake
@@ -161,8 +161,8 @@ ENDIF(LMMS_BUILD_WIN32)
 
 IF(LMMS_BUILD_APPLE)
 	# Detect cross-compilation.  "wrongbrew" is a custom wrapper for homebrew
-	IF((CMAKE_APPLE_SILICON_PROCESSOR STREQUAL "x86_64" AND NOT LMMS_HOST_X86_64) OR
-		(CMAKE_APPLE_SILICON_PROCESSOR STREQUAL "arm64" AND NOT LMMS_HOST_ARM64))
+	IF((CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" AND NOT LMMS_HOST_X86_64) OR
+		(CMAKE_OSX_ARCHITECTURES MATCHES "arm64" AND NOT LMMS_HOST_ARM64))
 		EXECUTE_PROCESS(COMMAND "$ENV{HOME}/wrongbrew.sh" --prefix RESULT_VARIABLE DETECT_WRONGBREW OUTPUT_VARIABLE WRONGBREW_PREFIX ERROR_QUIET OUTPUT_STRIP_TRAILING_WHITESPACE)
 	ENDIF()
 

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -22,10 +22,6 @@ foreach(LMMS_TEST_SRC IN LISTS LMMS_TESTS)
 	# TODO CMake 3.12: Propagate usage requirements by linking to lmmsobjs
 	target_include_directories(${LMMS_TEST_NAME} PRIVATE $<TARGET_PROPERTY:lmmsobjs,INCLUDE_DIRECTORIES>)
 
-	if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.13")
-		target_link_directories(${LMMS_TEST_NAME} PRIVATE $<TARGET_PROPERTY:lmmsobjs,LINK_DIRECTORIES>)
-	endif()
-
 	target_link_libraries(${LMMS_TEST_NAME} PRIVATE
 		${LMMS_REQUIRED_LIBS}
 		${QT_LIBRARIES}