mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-24 18:47:51 +08:00
53 lines
1.6 KiB
Diff
53 lines
1.6 KiB
Diff
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||
|
|
index 55dfc77..f0182f9 100644
|
||
|
|
--- a/CMakeLists.txt
|
||
|
|
+++ b/CMakeLists.txt
|
||
|
|
@@ -1,6 +1,6 @@
|
||
|
|
cmake_minimum_required(VERSION 3.4)
|
||
|
|
|
||
|
|
-project(zip
|
||
|
|
+project(kubazip
|
||
|
|
LANGUAGES C
|
||
|
|
VERSION "0.1.19")
|
||
|
|
set(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake" ${CMAKE_MODULE_PATH})
|
||
|
|
@@ -15,7 +15,7 @@ if (MSVC)
|
||
|
|
elseif ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR
|
||
|
|
"${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR
|
||
|
|
"${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")
|
||
|
|
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -Werror -pedantic")
|
||
|
|
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99 -Wall -Wextra -pedantic")
|
||
|
|
endif (MSVC)
|
||
|
|
|
||
|
|
# zip
|
||
|
|
@@ -37,7 +37,7 @@ endif()
|
||
|
|
|
||
|
|
target_include_directories(${PROJECT_NAME} PUBLIC
|
||
|
|
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
|
||
|
|
- $<INSTALL_INTERFACE:include>
|
||
|
|
+ $<INSTALL_INTERFACE:include/${PROJECT_NAME}>
|
||
|
|
)
|
||
|
|
|
||
|
|
# test
|
||
|
|
@@ -52,7 +52,7 @@ endif()
|
||
|
|
# Installation (https://github.com/forexample/package-example) {
|
||
|
|
|
||
|
|
set(CONFIG_INSTALL_DIR "lib/cmake/${PROJECT_NAME}")
|
||
|
|
-set(INCLUDE_INSTALL_DIR "include")
|
||
|
|
+set(INCLUDE_INSTALL_DIR "include/${PROJECT_NAME}")
|
||
|
|
|
||
|
|
set(GENERATED_DIR "${CMAKE_CURRENT_BINARY_DIR}/generated")
|
||
|
|
|
||
|
|
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
|
||
|
|
index 04c2123..002cf5a 100644
|
||
|
|
--- a/test/CMakeLists.txt
|
||
|
|
+++ b/test/CMakeLists.txt
|
||
|
|
@@ -4,7 +4,7 @@ cmake_minimum_required(VERSION 3.4)
|
||
|
|
set(test_out test.out)
|
||
|
|
|
||
|
|
add_executable(${test_out} test.c)
|
||
|
|
-target_link_libraries(${test_out} zip)
|
||
|
|
+target_link_libraries(${test_out} kubazip)
|
||
|
|
|
||
|
|
add_test(NAME ${test_out} COMMAND ${test_out})
|
||
|
|
|