diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2016-11-16 21:35:30 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-16 21:35:30 -0800 |
| commit | 9653c6216d1d6602d333f1ef9a1c45c82b72f556 (patch) | |
| tree | c30808a277e16fc79a30f78463fc4160b1079f51 | |
| parent | 56c3febc9de168df0707269e48d31701f60e7673 (diff) | |
| parent | 21c4404d393ec7fdb6513eaba01e63073e5f8e33 (diff) | |
| download | vcpkg-9653c6216d1d6602d333f1ef9a1c45c82b72f556.tar.gz vcpkg-9653c6216d1d6602d333f1ef9a1c45c82b72f556.zip | |
Merge pull request #300 from barcharcraz/fix_glfw
more glfw3 path fixes
| -rw-r--r-- | ports/glfw3/portfile.cmake | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ports/glfw3/portfile.cmake b/ports/glfw3/portfile.cmake index 8ec382fda..69f496969 100644 --- a/ports/glfw3/portfile.cmake +++ b/ports/glfw3/portfile.cmake @@ -12,9 +12,9 @@ if(NOT EXISTS ${CURRENT_BUILDTREES_DIR}/patch.stamp) string(REPLACE "\"@GLFW_LIB_NAME@\"" "NAMES @GLFW_LIB_NAME@ @GLFW_LIB_NAME@dll" CONFIG ${CONFIG} ) - string(REPLACE "@PACKAGE_CMAKE_INSTALL_PREFIX@" "@PACKAGE_CMAKE_INSTALL_PREFIX@/../.." - CONFIG ${CONFIG} - ) + #string(REPLACE "@PACKAGE_CMAKE_INSTALL_PREFIX@" "@PACKAGE_CMAKE_INSTALL_PREFIX@/../.." + # CONFIG ${CONFIG} + #) file(WRITE ${SOURCE_PATH}/src/glfw3Config.cmake.in ${CONFIG}) file(APPEND ${SOURCE_PATH}/src/glfw3Config.cmake.in "set(GLFW3_LIBRARIES \${GLFW3_LIBRARY})\n") file(WRITE ${CURRENT_BUILDTREES_DIR}/patch.stamp) @@ -35,7 +35,8 @@ file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/share) file(RENAME ${CURRENT_PACKAGES_DIR}/lib/cmake/glfw3 ${CURRENT_PACKAGES_DIR}/share/glfw3) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/lib/cmake) file(READ ${CURRENT_PACKAGES_DIR}/share/glfw3/glfw3Targets.cmake _contents) -string(REPLACE "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\n\n" "\n" _contents "${_contents}") +set(pattern "get_filename_component(_IMPORT_PREFIX \"\${_IMPORT_PREFIX}\" PATH)\n") +string(REPLACE "${pattern}${pattern}${pattern}" "${pattern}${pattern}" _contents "${_contents}") file(WRITE ${CURRENT_PACKAGES_DIR}/share/glfw3/glfw3Targets.cmake ${_contents}) file(READ ${CURRENT_PACKAGES_DIR}/debug/lib/cmake/glfw3/glfw3Targets-debug.cmake _contents) |