Try to fix macos build.

dchapyshev · Oct 30, 2023 · 9c26468 · 9c26468
1 parent 14b251a
commit 9c26468
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -62,11 +62,6 @@ endif()
 
 set(CMAKE_SKIP_BUILD_RPATH ON)
 
-message(STATUS "CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
-message(STATUS "CMAKE_HOST_SYSTEM_PROCESSOR: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
-message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY: ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
-message(STATUS "CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}")
-
 find_package(Qt5 REQUIRED Core Gui Network PrintSupport Widgets Xml)
 find_package(Qt5LinguistTools)
 find_package(asio CONFIG REQUIRED)

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -105,6 +105,18 @@ include_directories(${PROJECT_SOURCE_DIR}/source ${PROJECT_BINARY_DIR}/source)
 # C++ compliller flags.
 set(CMAKE_CXX_STANDARD 17)
 
+message(STATUS "CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")
+message(STATUS "CMAKE_HOST_SYSTEM_PROCESSOR: ${CMAKE_HOST_SYSTEM_PROCESSOR}")
+message(STATUS "CMAKE_RUNTIME_OUTPUT_DIRECTORY: ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
+message(STATUS "CMAKE_BINARY_DIR: ${CMAKE_BINARY_DIR}")
+message(STATUS "CMAKE_SOURCE_DIR: ${CMAKE_SOURCE_DIR}")
+
+if (CMAKE_BUILD_TYPE EQUAL "DEBUG")
+    message(STATUS "DEBUG build detected")
+else()
+    message(STATUS "RELEASE build detected")
+endif()
+
 if (MSVC)
     # C++ compliller flags.
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} /W3 /MP")

diff --git a/source/client/CMakeLists.txt b/source/client/CMakeLists.txt
@@ -375,7 +375,7 @@ if (APPLE)
     set_target_properties(aspia_client PROPERTIES MACOSX_BUNDLE_ICONFILE ${aspia_client_ICON})
 
     add_custom_command(TARGET aspia_client POST_BUILD
-        COMMAND ${CODESIGN_BIN} --force --sign "Developer ID Application" -v "${CMAKE_BINARY_DIR}/Aspia Client.app"
+        COMMAND ${CODESIGN_BIN} --force --sign "Developer ID Application" -v "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/Aspia Client.app"
         WORKING_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
         COMMENT "Signing..."
         VERBATIM)

diff --git a/source/console/CMakeLists.txt b/source/console/CMakeLists.txt
@@ -138,7 +138,7 @@ if (APPLE)
     set_target_properties(aspia_console PROPERTIES MACOSX_BUNDLE_ICONFILE ${aspia_console_ICON})
 
     add_custom_command(TARGET aspia_console POST_BUILD
-        COMMAND ${CODESIGN_BIN} --force --sign "Developer ID Application" -v "${CMAKE_BINARY_DIR}/Aspia Console.app"
+        COMMAND ${CODESIGN_BIN} --force --sign "Developer ID Application" -v "${CMAKE_BINARY_DIR}/${CMAKE_BUILD_TYPE}/Aspia Console.app"
         WORKING_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
         COMMENT "Signing..."
         VERBATIM)