diff options
| author | atkawa7 <atkawa7@yahoo.com> | 2017-06-29 15:18:58 -0700 |
|---|---|---|
| committer | atkawa7 <atkawa7@yahoo.com> | 2017-06-29 15:18:58 -0700 |
| commit | 03fde38584ef4723e1f1c0f566d6227077d4ac1f (patch) | |
| tree | d8a57d358aa69de2523a6d1f6c85427fcfa67335 | |
| parent | c588de6b8f6cbcb419d1b612676c247b41a73b54 (diff) | |
| download | vcpkg-03fde38584ef4723e1f1c0f566d6227077d4ac1f.tar.gz vcpkg-03fde38584ef4723e1f1c0f566d6227077d4ac1f.zip | |
[libconfig] use find path
| -rw-r--r-- | ports/libconfig/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | ports/libconfig/portfile.cmake | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/ports/libconfig/CMakeLists.txt b/ports/libconfig/CMakeLists.txt index e81d77948..61776d1aa 100644 --- a/ports/libconfig/CMakeLists.txt +++ b/ports/libconfig/CMakeLists.txt @@ -20,7 +20,12 @@ set(CPP_SOURCES ) include_directories(lib) -include_directories(lib/win32) + +find_path(DIRENT_H dirent.h) +find_path(STDINT_H stdint.h) + +include_directories(${DIRENT_H}) +include_directories(${STDINT_H}) add_library(libconfig ${C_SOURCES}) add_library(libconfig++ ${C_SOURCES} ${CPP_SOURCES}) diff --git a/ports/libconfig/portfile.cmake b/ports/libconfig/portfile.cmake index bff376bfc..7838958da 100644 --- a/ports/libconfig/portfile.cmake +++ b/ports/libconfig/portfile.cmake @@ -15,12 +15,8 @@ vcpkg_apply_patches( "${CMAKE_CURRENT_LIST_DIR}/fix-scanner-header-msvc-patch.patch" ) -set(WIN_SRC ${SOURCE_PATH}/lib/win32) - file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) -file(COPY ${CMAKE_CURRENT_LIST_DIR}/scandir.c DESTINATION ${WIN_SRC}) -file(COPY ${CURRENT_INSTALLED_DIR}/include/dirent.h DESTINATION ${WIN_SRC}) -file(COPY ${CURRENT_INSTALLED_DIR}/include/stdint.h DESTINATION ${WIN_SRC}) +file(COPY ${CMAKE_CURRENT_LIST_DIR}/scandir.c DESTINATION ${SOURCE_PATH}/lib/win32) vcpkg_configure_cmake( |