fix: typos
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f2569c..c859b23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -72,10 +72,10 @@
add_definitions( -DINCLUDE_MAC0=0 )
endif ()
if (NOT COSE_C_INCLUDE_SIGN)
- add_definitions( -DCOSE_C_INCLUDE_SIGN=0 )
+ add_definitions( -DINCLUDE_SIGN=0 )
endif ()
if (NOT COSE_C_INCLUDE_SIGN1)
- add_definitions( -DCOSE_C_INCLUDE_SIGN1=0 )
+ add_definitions( -DINCLUDE_SIGN1=0 )
endif ()
if ( MSVC OR CMAKE_C_COMPILER_ID MATCHES "Clang" )
@@ -150,7 +150,7 @@
project_cn-cbor
GIT_REPOSITORY https://github.com/jimsch/cn-cbor
GIT_TAG master
- CMAKE_ARGS -Doptimize=OFF -Duse_context=${COSE_C_USE_CONTEXT} -Dbuild_docs=OFF -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCOSE_C_COVERALLS=OFF -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -Dfatal_warnings=OFF
+ CMAKE_ARGS -Doptimize=OFF -Duse_context=${COSE_C_USE_CONTEXT} -Dbuild_docs=OFF -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -Dcoveralls=OFF -DBUILD_SHARED_LIBS=${BUILD_SHARED_LIBS} -Dfatal_warnings=OFF
INSTALL_DIR "${dist_dir}"
UPDATE_DISCONNECTED 1
)
@@ -178,7 +178,7 @@
ExternalProject_Add(
project_mbedtls
GIT_REPOSITORY https://github.com/ARMmbed/mbedtls
- CMAKE_ARGS -DENABLED_PROGRAMS=OFF -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -DCOSE_C_COVERALLS=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=${BUILD_SHARED_LIBS} -Dfatal_warnings=OFF -DENABLE_TESTING=OFF -DLIB_INSTALL_DIR=${install_dir}/lib
+ CMAKE_ARGS -DENABLED_PROGRAMS=OFF -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> -Dcoveralls=OFF -DUSE_SHARED_MBEDTLS_LIBRARY=${BUILD_SHARED_LIBS} -Dfatal_warnings=OFF -DENABLE_TESTING=OFF -DLIB_INSTALL_DIR=${install_dir}/lib
INTALL_DIR "${dist_dir}"
UPDATE_DISCONNECTED 1
)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2361bba..55e577e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,4 +1,3 @@
-include(GNUInstallDirs)
if (COSE_C_USE_MBEDTLS)
set (cose_crypto mbedtls.c)
@@ -48,18 +47,6 @@
target_link_libraries( cose-c PRIVATE ws2_32 )
endif ()
-install ( TARGETS cose-c
- LIBRARY DESTINATION lib
- ARCHIVE DESTINATION lib
- RUNTIME DESTINATION bin)
-install(
- DIRECTORY ../include
- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
- COMPONENT dev
- FILES_MATCHING
- PATTERN "*.h")
-
-set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake)
if (COSE_C_COVERALLS)
include(Coveralls)
coveralls_turn_on_coverage()
@@ -76,3 +63,22 @@
${COSE_C_COVERALLS_SEND} # If we should upload
)
endif()
+
+
+###############################################################################
+# INSTALL LIBRARY
+###############################################################################
+
+include(GNUInstallDirs)
+
+install ( TARGETS cose-c
+ LIBRARY DESTINATION lib
+ ARCHIVE DESTINATION lib
+ RUNTIME DESTINATION bin)
+install(
+ DIRECTORY ../include
+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+ COMPONENT dev
+ FILES_MATCHING
+ PATTERN "*.h")
+