From c873327fe3c3a4d8a38fb35a2b633c890c8d23cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Sun, 8 Jan 2017 15:51:37 +0100 Subject: [PATCH] Fix NOTFOUND paths being added as dependencies Fixes #930. --- README.md | 1 + examples/CMakeLists.txt | 7 +++++-- tests/CMakeLists.txt | 10 +++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index c9647964..7de775a5 100644 --- a/README.md +++ b/README.md @@ -119,6 +119,7 @@ information on what to include when reporting a bug. OpenGL and OpenGL ES header macros - Bugfix: `glfwGetInstanceProcAddress` returned `NULL` for `vkGetInstanceProcAddr` when `_GLFW_VULKAN_STATIC` was enabled +- Bugfix: Invalid library paths were used in test and example CMake files (#930) - [Win32] Bugfix: Undecorated windows could not be iconified by the user (#861) - [Win32] Bugfix: Deadzone logic could underflow with some controllers (#910) - [Win32] Bugfix: Bitness test in `FindVulkan.cmake` was VS specific (#928) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 78642f73..f7a2ebe4 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -3,7 +3,7 @@ link_libraries(glfw) include_directories(${glfw_INCLUDE_DIRS} "${GLFW_SOURCE_DIR}/deps") -if (BUILD_SHARED_LIBS) +if (MATH_LIBRARY) link_libraries("${MATH_LIBRARY}") endif() @@ -39,7 +39,10 @@ add_executable(simple WIN32 MACOSX_BUNDLE simple.c ${ICON} ${GLAD}) add_executable(splitview WIN32 MACOSX_BUNDLE splitview.c ${ICON} ${GLAD}) add_executable(wave WIN32 MACOSX_BUNDLE wave.c ${ICON} ${GLAD}) -target_link_libraries(particles "${CMAKE_THREAD_LIBS_INIT}" "${RT_LIBRARY}") +target_link_libraries(particles "${CMAKE_THREAD_LIBS_INIT}") +if (RT_LIBRARY) + target_link_libraries(particles "${RT_LIBRARY}") +endif() set(WINDOWS_BINARIES boing gears heightmap particles simple splitview wave) set(CONSOLE_BINARIES offscreen) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 1f82d9f7..9f56bcb7 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -3,7 +3,7 @@ link_libraries(glfw) include_directories(${glfw_INCLUDE_DIRS} "${GLFW_SOURCE_DIR}/deps") -if (BUILD_SHARED_LIBS) +if (MATH_LIBRARY) link_libraries("${MATH_LIBRARY}") endif() @@ -38,8 +38,12 @@ add_executable(timeout WIN32 MACOSX_BUNDLE timeout.c ${GLAD}) add_executable(title WIN32 MACOSX_BUNDLE title.c ${GLAD}) add_executable(windows WIN32 MACOSX_BUNDLE windows.c ${GETOPT} ${GLAD}) -target_link_libraries(empty "${CMAKE_THREAD_LIBS_INIT}" "${RT_LIBRARY}") -target_link_libraries(threads "${CMAKE_THREAD_LIBS_INIT}" "${RT_LIBRARY}") +target_link_libraries(empty "${CMAKE_THREAD_LIBS_INIT}") +target_link_libraries(threads "${CMAKE_THREAD_LIBS_INIT}") +if (RT_LIBRARY) + target_link_libraries(empty "${RT_LIBRARY}") + target_link_libraries(threads "${RT_LIBRARY}") +endif() set(WINDOWS_BINARIES empty gamma icon joysticks sharing tearing threads timeout title windows)