diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2018-04-30 13:44:29 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 13:44:29 -0700 |
| commit | a59307436e0088a7016cb4e6cbbd9b7ae75ca729 (patch) | |
| tree | 60b0d79153a484f6879ac4cf53d31c01950d1b5d | |
| parent | a9d989ec056246ea320a56ca7d02b161a6fee387 (diff) | |
| parent | c72e6326dd4df3096144fe5cd510dc525ec39c9a (diff) | |
| download | vcpkg-a59307436e0088a7016cb4e6cbbd9b7ae75ca729.tar.gz vcpkg-a59307436e0088a7016cb4e6cbbd9b7ae75ca729.zip | |
Merge pull request #3392 from agruzdev/dev/agruzdev/yato
[yato] Bugfix
| -rw-r--r-- | ports/yato/portfile.cmake | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/ports/yato/portfile.cmake b/ports/yato/portfile.cmake index f688675ba..44ee93782 100644 --- a/ports/yato/portfile.cmake +++ b/ports/yato/portfile.cmake @@ -12,30 +12,30 @@ vcpkg_from_bitbucket( file(COPY "${SOURCE_PATH}/include/yato"
DESTINATION "${CURRENT_PACKAGES_DIR}/include"
)
+file(COPY "${SOURCE_PATH}/modules/actors/yato"
+ DESTINATION "${CURRENT_PACKAGES_DIR}/include"
+)
+file(COPY "${SOURCE_PATH}/modules/config/yato"
+ DESTINATION "${CURRENT_PACKAGES_DIR}/include"
+)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
- OPTIONS -DYATO_BUILD_TESTS:BOOL=OFF -DYATO_BUILD_ACTORS:BOOL=ON -DYATO_BUILD_CONFIG:BOOL=ON -DYATO_CONFIG_MANUAL:BOOL=ON
+ OPTIONS
+ -DYATO_BUILD_TESTS:BOOL=OFF
+ -DYATO_BUILD_ACTORS:BOOL=ON
+ -DYATO_BUILD_CONFIG:BOOL=ON
+ -DYATO_CONFIG_MANUAL:BOOL=ON
+ -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/
+ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/
+ -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG:PATH=${CURRENT_PACKAGES_DIR}/debug/lib/
+ -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/
+ -DCMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/
+ -DCMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE:PATH=${CURRENT_PACKAGES_DIR}/lib/
)
vcpkg_build_cmake()
-set(BUILD_ROOT_DEBUG "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg")
-set(BUILD_ROOT_RELEASE "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel")
-
-file(COPY "${BUILD_ROOT_DEBUG}/modules/actors/Debug/YatoActors.lib"
- "${BUILD_ROOT_DEBUG}/modules/config/Debug/YatoConfig.lib"
- DESTINATION "${CURRENT_PACKAGES_DIR}/debug/lib/"
-)
-
-file(COPY "${BUILD_ROOT_RELEASE}/modules/actors/Release/YatoActors.lib"
- "${BUILD_ROOT_RELEASE}/modules/config/Release/YatoConfig.lib"
- DESTINATION "${CURRENT_PACKAGES_DIR}/lib/"
-)
-
# Handle copyright
file(COPY ${SOURCE_PATH}/LICENSE.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/yato)
file(RENAME ${CURRENT_PACKAGES_DIR}/share/yato/LICENSE.txt ${CURRENT_PACKAGES_DIR}/share/yato/copyright)
-
-
-
|