diff options
| author | Alexander Saprykin <xelfium@gmail.com> | 2018-05-26 13:27:14 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-26 13:27:14 +0200 |
| commit | 4ce5f064282c3a8d8d710aa82af7aa346b0c6dd5 (patch) | |
| tree | d95c9490352eb73f078d34a33bc4bb44ac9fa48b /ports/atk | |
| parent | fb689bd13dd6ba563a885d71fff1dd2b32a615db (diff) | |
| parent | 2ac7527b40b1dbeb7856b9f763362c1e139e2ca9 (diff) | |
| download | vcpkg-4ce5f064282c3a8d8d710aa82af7aa346b0c6dd5.tar.gz vcpkg-4ce5f064282c3a8d8d710aa82af7aa346b0c6dd5.zip | |
Merge pull request #1 from Microsoft/master
Update vcpkg from upstream
Diffstat (limited to 'ports/atk')
| -rw-r--r-- | ports/atk/CMakeLists.txt | 31 | ||||
| -rw-r--r-- | ports/atk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/atk/portfile.cmake | 5 |
3 files changed, 21 insertions, 17 deletions
diff --git a/ports/atk/CMakeLists.txt b/ports/atk/CMakeLists.txt index f260e09e9..41937fff9 100644 --- a/ports/atk/CMakeLists.txt +++ b/ports/atk/CMakeLists.txt @@ -11,21 +11,26 @@ endif() # generate atkmarshal.c and atkmarshal.h source files # glib-genmarshal should be installed along with glib -if(NOT EXISTS ${CMAKE_SOURCE_DIR}/atk/atkmarshal.h OR NOT EXISTS ${CMAKE_SOURCE_DIR}/atk/atkmarshal.c) - find_program(GLIB_GENMARSHAL glib-genmarshal PATH_SUFFIXES glib) - execute_process( - COMMAND ${GLIB_GENMARSHAL} --prefix=atk_marshal atkmarshal.list --header - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/atk - OUTPUT_FILE ${CMAKE_SOURCE_DIR}/atk/atkmarshal.h) - execute_process( - COMMAND ${GLIB_GENMARSHAL} --prefix=atk_marshal atkmarshal.list --body - WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/atk - OUTPUT_FILE ${CMAKE_SOURCE_DIR}/atk/atkmarshal.c) -endif() +find_program(GLIB_GENMARSHAL glib-genmarshal PATH_SUFFIXES glib) +file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/atk) + +message("Generating atkmarshal.h: ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --header") +execute_process( + COMMAND ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --header + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/atk + OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/atk/atkmarshal.h +) + +message("Generating atkmarshal.c: ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --body") +execute_process( + COMMAND ${GLIB_GENMARSHAL} --prefix=atk_marshal ${CMAKE_CURRENT_SOURCE_DIR}/atk/atkmarshal.list --body + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/atk + OUTPUT_FILE ${CMAKE_CURRENT_BINARY_DIR}/atk/atkmarshal.c +) -configure_file(config.h.win32 ${CMAKE_SOURCE_DIR}/config.h COPYONLY) +configure_file(config.h.win32 ${CMAKE_CURRENT_BINARY_DIR}/config.h COPYONLY) add_definitions(-DHAVE_CONFIG_H) -include_directories(. ./atk) +include_directories(. ./atk ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/atk) find_path(GLIB_INCLUDE_DIR glib.h) find_library(GLIB_GLIB_LIBRARY glib-${GLIB_LIB_VERSION}) diff --git a/ports/atk/CONTROL b/ports/atk/CONTROL index 149c564a7..b4bdda0eb 100644 --- a/ports/atk/CONTROL +++ b/ports/atk/CONTROL @@ -1,4 +1,4 @@ Source: atk
-Version: 2.24.0
+Version: 2.24.0-2
Description: GNOME Accessibility Toolkit
Build-Depends: glib, gettext
diff --git a/ports/atk/portfile.cmake b/ports/atk/portfile.cmake index 66207d5ca..8b65312e5 100644 --- a/ports/atk/portfile.cmake +++ b/ports/atk/portfile.cmake @@ -1,7 +1,6 @@ # ATK uses DllMain
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
- message(STATUS "Warning: Static building not supported. Building dynamic.")
- set(VCPKG_LIBRARY_LINKAGE dynamic)
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "static" OR VCPKG_CRT_LINKAGE STREQUAL "static")
+ message(FATAL_ERROR "ATK only supports dynamic library and crt linkage")
endif()
include(vcpkg_common_functions)
|