mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-03 05:49:01 +08:00
be3b12a118
<!-- If your PR fixes issues, please note that here by adding "Fixes #NNNNNN." for each fixed issue on separate lines. --> Fixes #36806 Usage passed on `x64-windows`. <!-- If you are still working on the PR, open it as a Draft: https://github.blog/2019-02-14-introducing-draft-pull-requests/. --> - [x] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [x] SHA512s are updated for each updated download. - [ ] ~~The "supports" clause reflects platforms that may be fixed by this new version.~~ - [ ] Any fixed [CI baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt) entries are removed from that file. - [x] Any patches that are no longer applied are deleted from the port's directory. - [x] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [x] Only one version is added to each modified port's versions file. <!-- If this PR adds a new port, please uncomment and fill out this checklist: - [ ] Changes comply with the [maintainer guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md). - [ ] The name of the port matches an existing name for this component on https://repology.org/ if possible, and/or is strongly associated with that component on search engines. - [ ] Optional dependencies are resolved in exactly one way. For example, if the component is built with CMake, all `find_package` calls are REQUIRED, are satisfied by `vcpkg.json`'s declared dependencies, or disabled with [CMAKE_DISABLE_FIND_PACKAGE_Xxx](https://cmake.org/cmake/help/latest/variable/CMAKE_DISABLE_FIND_PACKAGE_PackageName.html). - [ ] The versioning scheme in `vcpkg.json` matches what upstream says. - [ ] The license declaration in `vcpkg.json` matches what upstream says. - [ ] The installed as the "copyright" file matches what upstream says. - [ ] The source code of the component installed comes from an authoritative source. - [ ] The generated "usage text" is accurate. See [adding-usage](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/examples/adding-usage.md) for context. - [ ] The version database is fixed by rerunning `./vcpkg x-add-version --all` and committing the result. - [ ] Only one version is in the new port's versions file. - [ ] Only one version is added to each modified port's versions file. END OF NEW PORT CHECKLIST (delete this line) --> --------- Co-authored-by: Lily Wang <v-lilywang@microsoft.com>
41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 2f8c3af..d4d4425 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -27,7 +27,9 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
|
|
include(GNUInstallDirs)
|
|
|
|
include(CTest)
|
|
+if(0)
|
|
enable_testing()
|
|
+endif()
|
|
|
|
# Setup platform-specific threading flags.
|
|
find_package(Threads REQUIRED)
|
|
@@ -112,7 +114,9 @@ endif ()
|
|
include_directories(src/ptex)
|
|
|
|
add_subdirectory(src/ptex)
|
|
+if(0)
|
|
add_subdirectory(src/utils)
|
|
add_subdirectory(src/tests)
|
|
add_subdirectory(src/doc)
|
|
+endif()
|
|
add_subdirectory(src/build)
|
|
diff --git a/src/ptex/CMakeLists.txt b/src/ptex/CMakeLists.txt
|
|
index 4dfe372..4572dd5 100644
|
|
--- a/src/ptex/CMakeLists.txt
|
|
+++ b/src/ptex/CMakeLists.txt
|
|
@@ -40,7 +40,10 @@ if(PTEX_BUILD_SHARED_LIBS)
|
|
target_compile_definitions(Ptex_dynamic PRIVATE PTEX_EXPORTS)
|
|
target_link_libraries(Ptex_dynamic
|
|
PUBLIC Threads::Threads ZLIB::ZLIB)
|
|
- install(TARGETS Ptex_dynamic EXPORT Ptex DESTINATION ${CMAKE_INSTALL_LIBDIR})
|
|
+ install(TARGETS Ptex_dynamic EXPORT Ptex
|
|
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}
|
|
+ LIBRARY DESTINATION ${LIB_INSTALL_DIR}
|
|
+ ARCHIVE DESTINATION ${LIB_INSTALL_DIR})
|
|
endif()
|
|
|
|
install(FILES
|