diff --git a/retroshare-gui/CMakeLists.txt b/retroshare-gui/CMakeLists.txt
index 1e5b11544..b6a8e90f0 100644
--- a/retroshare-gui/CMakeLists.txt
+++ b/retroshare-gui/CMakeLists.txt
@@ -156,8 +156,8 @@ endif(RS_DEVELOPMENT_BUILD)
 ################################################################################
 
 if(NOT TARGET retroshare)
-	set(LIBRETROSHARE_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libretroshare/")
-	if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/.git" )
+	get_filename_component(LIBRETROSHARE_DEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../libretroshare/" ABSOLUTE)
+	if(EXISTS "${LIBRETROSHARE_DEVEL_DIR}/CMakeLists.txt" )
 		message(
 			STATUS
 			"libretroshare submodule found at ${LIBRETROSHARE_DEVEL_DIR} using it" )
@@ -173,7 +173,10 @@ if(NOT TARGET retroshare)
 			TIMEOUT 10
 		)
 		FetchContent_MakeAvailable(libretroshare)
+		set(LIBRETROSHARE_DEVEL_DIR "${libretroshare_SOURCE_DIR}")
 	endif()
+else()
+	get_target_property(LIBRETROSHARE_DEVEL_DIR retroshare SOURCE_DIR)
 endif()
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${LIBRETROSHARE_DEVEL_DIR}/src/)
diff --git a/retroshare-service/CMakeLists.txt b/retroshare-service/CMakeLists.txt
index d82be72b9..187fa181b 100644
--- a/retroshare-service/CMakeLists.txt
+++ b/retroshare-service/CMakeLists.txt
@@ -10,10 +10,7 @@ project(retroshare-service)
 
 include(CMakeDependentOption)
 
-if(APPLE)
-  include_directories("/usr/local/include") 
-  LINK_DIRECTORIES("/usr/local/lib")
-endif()
+
 
 set(
 	RS_BIN_INSTALL_DIR
@@ -98,6 +95,11 @@ list(
 
 add_executable(${PROJECT_NAME} ${RS_SERVICE_SOURCES})
 
+if(APPLE)
+	target_include_directories(${PROJECT_NAME} PRIVATE "/usr/local/include")
+	target_link_directories(${PROJECT_NAME} PRIVATE "/usr/local/lib")
+endif()
+
 set_property(TARGET ${PROJECT_NAME} PROPERTY CXX_STANDARD 17)
 
 install(TARGETS ${PROJECT_NAME} DESTINATION ${RS_BIN_INSTALL_DIR})