Re: [Piglit] [PATCH 10/12] HACK: cmake: link in waffle's third_party static libraries

2014-08-13 Thread Brian Paul 

On 08/12/2014 11:18 AM, Emil Velikov wrote:

For some bizzare reason the MSVC build fails with unresolved symbols
without these two set in. I'm suspecting that something fishy is
happening with waffle and/or cmake + MSVC. Until we have that one
resolved, this helps us get through with the build.

Signed-off-by: Emil Velikov 
---
  tests/util/CMakeLists.txt | 5 +
  1 file changed, 5 insertions(+)

diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
index 35e2215..7ef6989 100644
--- a/tests/util/CMakeLists.txt
+++ b/tests/util/CMakeLists.txt
@@ -82,8 +82,13 @@ if(PIGLIT_USE_WAFFLE)
)
endif()

+   # XXX: HACK: THREAD_LIBRARIES and GETOPT_LIBRARIES should not be


"should not be needed"?


+   # yet without them we end up with unresolved symbols.
+   # The two are third_party waffle static libraries.
list(APPEND UTIL_GL_LIBS
${WAFFLE_LIBRARIES}
+   ${THREAD_LIBRARIES}
+   ${GETOPT_LIBRARIES}
)
  else()
list(APPEND UTIL_GL_SOURCES



___
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH 10/12] HACK: cmake: link in waffle's third_party static libraries

2014-08-12 Thread Emil Velikov 
For some bizzare reason the MSVC build fails with unresolved symbols
without these two set in. I'm suspecting that something fishy is
happening with waffle and/or cmake + MSVC. Until we have that one
resolved, this helps us get through with the build.

Signed-off-by: Emil Velikov 
---
 tests/util/CMakeLists.txt | 5 +
 1 file changed, 5 insertions(+)

diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt
index 35e2215..7ef6989 100644
--- a/tests/util/CMakeLists.txt
+++ b/tests/util/CMakeLists.txt
@@ -82,8 +82,13 @@ if(PIGLIT_USE_WAFFLE)
)
endif()
 
+   # XXX: HACK: THREAD_LIBRARIES and GETOPT_LIBRARIES should not be
+   # yet without them we end up with unresolved symbols.
+   # The two are third_party waffle static libraries.
list(APPEND UTIL_GL_LIBS
${WAFFLE_LIBRARIES}
+   ${THREAD_LIBRARIES}
+   ${GETOPT_LIBRARIES}
)
 else()
list(APPEND UTIL_GL_SOURCES
-- 
2.0.2

___
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit