Build fixes on macOS

ngscopeclient · Sep 11, 2022 · 36c9d06 · 36c9d06
1 parent 98dbbe8
commit 36c9d06
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -55,6 +55,7 @@ include(FindOpenMP)
 find_package(glfw3 3.2 REQUIRED)
 
 # Use the local FindVulkan script until we can rely on all users having CMake 3.24 available, at which point we can remove it
+set(Vulkan_FIND_COMPONENTS glslang shaderc_combined)
 include(FindVulkan)
 
 if(NOT Vulkan_FOUND)

diff --git a/src/ngscopeclient/CMakeLists.txt b/src/ngscopeclient/CMakeLists.txt
@@ -7,7 +7,8 @@ include_directories(
 	${CMAKE_CURRENT_SOURCE_DIR}/../imgui/misc/cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/../implot/
 	)
-link_directories(${SIGCXX_LIBRARY_DIRS})
+link_directories(${GTKMM_LIBRARY_DIRS} ${SIGCXX_LIBRARY_DIRS})
+find_package(glfw3 REQUIRED)
 
 ###############################################################################
 #C++ compilation

diff --git a/tests/Acceleration/CMakeLists.txt b/tests/Acceleration/CMakeLists.txt
@@ -7,12 +7,13 @@ add_executable(Acceleration
 catch_discover_tests(Acceleration)
 
 include_directories(${GTKMM_INCLUDE_DIRS} ${SIGCXX_INCLUDE_DIRS})
+target_link_directories(Acceleration PUBLIC ${GTKMM_LIBRARY_DIRS} ${SIGCXX_LIBRARY_DIRS})
 
 ###############################################################################
 #Linker settings
 target_link_libraries(Acceleration
 	scopehal
 	scopeprotocols
-	yaml-cpp
+	${YAML_LIBRARIES}
 	Catch2::Catch2
 	)
diff --git a/tests/Filters/CMakeLists.txt b/tests/Filters/CMakeLists.txt
@@ -13,12 +13,13 @@ add_executable(Filters
 catch_discover_tests(Filters)
 
 include_directories(${GTKMM_INCLUDE_DIRS} ${SIGCXX_INCLUDE_DIRS})
+target_link_directories(Filters PUBLIC ${GTKMM_LIBRARY_DIRS} ${SIGCXX_LIBRARY_DIRS})
 
 ###############################################################################
 #Linker settings
 target_link_libraries(Filters
 	scopehal
 	scopeprotocols
-	yaml-cpp
+	${YAML_LIBRARIES}
 	Catch2::Catch2
 	)
diff --git a/tests/Primitives/CMakeLists.txt b/tests/Primitives/CMakeLists.txt
@@ -10,12 +10,13 @@ add_executable(Primitives
 catch_discover_tests(Primitives)
 
 include_directories(${GTKMM_INCLUDE_DIRS} ${SIGCXX_INCLUDE_DIRS})
+target_link_directories(Primitives PUBLIC ${GTKMM_LIBRARY_DIRS} ${SIGCXX_LIBRARY_DIRS})
 
 ###############################################################################
 #Linker settings
 target_link_libraries(Primitives
 	scopehal
 	scopeprotocols
-	yaml-cpp
+	${YAML_LIBRARIES}
 	Catch2::Catch2
 	)