Merge branch 'build' of https://github.com/CendioOssman/tigervnc
diff --git a/cmake/Modules/CMakeMacroLibtoolFile.cmake b/cmake/Modules/CMakeMacroLibtoolFile.cmake
index 0afb7a6..f2ea7f8 100644
--- a/cmake/Modules/CMakeMacroLibtoolFile.cmake
+++ b/cmake/Modules/CMakeMacroLibtoolFile.cmake
@@ -14,7 +14,21 @@
# into libtool control file as library dependencies, and handle a few corner
# cases.
#
+
+ # First we need to split up any internal entries
+ set(target_libs "")
foreach(library ${${_target}_LIB_DEPENDS})
+ if("${library}" MATCHES " ")
+ string(REPLACE " " ";" lib_list "${library}")
+ list(APPEND target_libs ${lib_list})
+ else()
+ list(APPEND target_libs "${library}")
+ endif()
+ endforeach()
+
+ set(STATIC_MODE OFF)
+
+ foreach(library ${target_libs})
# Assume all entries are shared libs if platform-specific static library
# extension is not matched.
if("${library}" MATCHES "[^.+\\${CMAKE_STATIC_LIBRARY_SUFFIX}]$")
@@ -31,23 +45,46 @@
# No shared library extension matched. Check whether target is a CMake
# target.
get_target_property(_ltp ${library} TYPE)
- if(NOT _ltp AND NOT ${library} STREQUAL "general")
- # Not a CMake target, so use find_library() to attempt to locate the
+ if(_ltp OR ${library} STREQUAL "general")
+ # Target is a CMake target, so ignore (CMake targets are static
+ # libs in TigerVNC.)
+ elseif(${library} STREQUAL "-Wl,-Bstatic")
+ # All following libraries should be static
+ set(STATIC_MODE ON)
+ elseif(${library} STREQUAL "-Wl,-Bdynamic")
+ # All following libraries should be dynamic
+ set(STATIC_MODE OFF)
+ else()
+ # Normal library, so use find_library() to attempt to locate the
# library in a system directory.
+
+ # Need to remove -l prefix
+ if (${library} MATCHES "^\\${CMAKE_LINK_LIBRARY_FLAG}")
+ string(REPLACE ${CMAKE_LINK_LIBRARY_FLAG} "" library ${library})
+ endif()
+
+ if(STATIC_MODE)
+ set(library ${CMAKE_STATIC_LIBRARY_PREFIX}${library}${CMAKE_STATIC_LIBRARY_SUFFIX})
+ endif()
+
find_library(FL ${library})
if(FL)
- # Found library, so extract the path and library name, then add the
+ # Found library. Depending on if it's static or not we might
+ # extract the path and library name, then add the
# result to the libtool dependency libs.
- get_filename_component(_shared_lib ${FL} NAME_WE)
- get_filename_component(_shared_lib_path ${FL} PATH)
- string(REPLACE "lib" "" _shared_lib ${_shared_lib})
- set(_target_dependency_libs "${_target_dependency_libs} -L${_shared_lib_path} -l${_shared_lib}")
+ if(STATIC_MODE)
+ set(_target_dependency_libs "${_target_dependency_libs} ${FL}")
+ else()
+ get_filename_component(_shared_lib ${FL} NAME_WE)
+ get_filename_component(_shared_lib_path ${FL} PATH)
+ string(REPLACE "lib" "" _shared_lib ${_shared_lib})
+ set(_target_dependency_libs "${_target_dependency_libs} -L${_shared_lib_path} -l${_shared_lib}")
+ endif()
else()
- # No shared library found, so ignore target.
+ # No library found, so ignore target.
endif()
- else()
- # Target is a CMake target, so ignore if (CMake targets are static
- # libs in TigerVNC.)
+ # Need to clear FL to get new results next loop
+ unset(FL CACHE)
endif()
endif()
else()
@@ -69,6 +106,8 @@
else()
# No absolute pathname found. Ignore it.
endif()
+ # Need to clear FL to get new results next loop
+ unset(FL CACHE)
endif()
endif()
endforeach()
@@ -76,10 +115,6 @@
# Write the libtool control file for the static library
get_filename_component(_lname ${_target_location} NAME_WE)
set(_laname ${CMAKE_CURRENT_BINARY_DIR}/${_lname}.la)
-
- if(BUILD_STATIC)
- set(_target_dependency_libs "${_target_dependency_libs} -L${CMAKE_BINARY_DIR}/staticlib")
- endif()
file(WRITE ${_laname} "# ${_lname}.la - a libtool library file\n# Generated by ltmain.sh (GNU libtool) 2.2.6b\n")
file(APPEND ${_laname} "dlname=''\n\n")
diff --git a/cmake/StaticBuild.cmake b/cmake/StaticBuild.cmake
index 7679f45..df12db4 100644
--- a/cmake/StaticBuild.cmake
+++ b/cmake/StaticBuild.cmake
@@ -101,7 +101,11 @@
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -nodefaultlibs")
set(STATIC_BASE_LIBRARIES "-Wl,-Bstatic -lstdc++ -Wl,-Bdynamic")
if(WIN32)
- set(STATIC_BASE_LIBRARIES "${STATIC_BASE_LIBRARIES} -lmingw32 -lmoldname -lmingwex -lgcc -lgcc_eh -lmsvcrt -lkernel32")
+ set(STATIC_BASE_LIBRARIES "${STATIC_BASE_LIBRARIES} -lmingw32 -lgcc_eh -lgcc -lmoldname -lmingwex -lmsvcrt")
+ set(STATIC_BASE_LIBRARIES "${STATIC_BASE_LIBRARIES} -luser32 -lkernel32 -ladvapi32 -lshell32")
+ # mingw has some fun circular dependencies that requires us to link
+ # these things again
+ set(STATIC_BASE_LIBRARIES "${STATIC_BASE_LIBRARIES} -lmingw32 -lgcc_eh -lgcc -lmoldname -lmingwex -lmsvcrt")
else()
set(STATIC_BASE_LIBRARIES "${STATIC_BASE_LIBRARIES} -lgcc -lgcc_eh -lc")
endif()