[Piglit] [RFC PATCH 2/2] cmake: build the util libraries as shared under Windows
Emil Velikov
emil.l.velikov at gmail.com
Sat Nov 22 14:26:40 PST 2014
Rather than rebuilding every single test as we change the util
libraries and increase the size of each test by ~9MiB (as noticed
in the mingw-w64 build), just revert to shared piglitutil* libs.
TODO:
- Check if the DLLs are installed and where.
- If there is one or more executables linking against them, but located
in a different folder, see the next todo note.
- Modify the python scripts to set PATH to the location of the DLLs.
Alternatively apply any of the other solutions as mentioned here
http://msdn.microsoft.com/en-us/library/7d83bc18.aspxy
Cc: José Fonseca <jfonseca at vmware.com>
Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
---
cmake/piglit_util.cmake | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/cmake/piglit_util.cmake b/cmake/piglit_util.cmake
index 411fa54..48e89c1 100644
--- a/cmake/piglit_util.cmake
+++ b/cmake/piglit_util.cmake
@@ -77,12 +77,8 @@ endfunction(piglit_add_executable)
function(piglit_add_library name)
list(REMOVE_AT ARGV 0)
- if(WIN32)
- add_library(${name} STATIC ${ARGV})
- else(WIN32)
- add_library(${name} SHARED ${ARGV})
- install(TARGETS ${name} DESTINATION ${PIGLIT_INSTALL_LIBDIR}/lib)
- endif(WIN32)
+ add_library(${name} SHARED ${ARGV})
+ install(TARGETS ${name} DESTINATION ${PIGLIT_INSTALL_LIBDIR}/lib)
add_dependencies(${name} piglit_dispatch_gen)
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
set_target_properties(${name} PROPERTIES SOVERSION "0")
--
2.1.3
More information about the Piglit
mailing list