Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for static builds with mingw-w64 compilers - part 2

Browse Source
This commit is contained in:
Baruch 2012-05-01 23:01:56 +03:00
parent 165f2b1888
commit f784fe4c07
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
cmake/Macros.cmake
View File

@ -1,4 +1,3 @@
# some of these macros are inspired from the boost/cmake macros # some of these macros are inspired from the boost/cmake macros
# this macro adds external dependencies to a static target, # this macro adds external dependencies to a static target,
@ -16,7 +15,11 @@ macro(sfml_static_add_libraries target)
foreach(lib ${ARGN}) foreach(lib ${ARGN})
if(NOT ${lib} MATCHES ".*/.*") if(NOT ${lib} MATCHES ".*/.*")
string(REGEX REPLACE "(.*)/bin/.*\\.exe" "\\1" STANDARD_LIBS_PATH "${CMAKE_CXX_COMPILER}") string(REGEX REPLACE "(.*)/bin/.*\\.exe" "\\1" STANDARD_LIBS_PATH "${CMAKE_CXX_COMPILER}")
set(lib "${STANDARD_LIBS_PATH}/lib/lib${lib}.a") if(COMPILER_GCC_W64)
set(lib "${STANDARD_LIBS_PATH}/${GCC_MACHINE}/lib/lib${lib}.a")
else()
set(lib "${STANDARD_LIBS_PATH}/lib/lib${lib}.a")
endif()
endif() endif()
string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE) string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE)
get_target_property(TARGET_FILENAME ${target} ${BUILD_TYPE}_LOCATION) get_target_property(TARGET_FILENAME ${target} ${BUILD_TYPE}_LOCATION)
@ -43,7 +46,7 @@ macro(sfml_static_add_libraries target)
endif() endif()
endforeach() endforeach()
set_target_properties(${target} PROPERTIES STATIC_LIBRARY_FLAGS ${LIBRARIES}) set_target_properties(${target} PROPERTIES STATIC_LIBRARY_FLAGS ${LIBRARIES})
else() else()
# All other platforms # All other platforms
target_link_libraries(${target} ${ARGN}) target_link_libraries(${target} ${ARGN})
endif() endif()