You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
57 lines
1.9 KiB
57 lines
1.9 KiB
Index: CMakeLists.txt |
|
--- CMakeLists.txt.orig 2020-04-29 08:14:33.403776000 +0200 |
|
+++ CMakeLists.txt 2020-04-29 20:49:30.600909000 +0200 |
|
@@ -70,7 +70,7 @@ |
|
set(CBOR_RESTRICT_SPECIFIER "restrict") |
|
|
|
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -O0 -Wall -g -ggdb -DDEBUG=true") |
|
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -Wall -DNDEBUG") |
|
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -DNDEBUG") |
|
|
|
if(SANITIZE) |
|
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} \ |
|
@@ -144,16 +144,3 @@ |
|
set_property(DIRECTORY src PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) |
|
endif(use_lto) |
|
|
|
-if (WITH_TESTS) |
|
- subdirs(test) |
|
- if(use_lto) |
|
- set_property(DIRECTORY test PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) |
|
- endif(use_lto) |
|
-endif (WITH_TESTS) |
|
- |
|
-if (WITH_EXAMPLES) |
|
- subdirs(examples) |
|
- if(use_lto) |
|
- set_property(DIRECTORY examples PROPERTY INTERPROCEDURAL_OPTIMIZATION TRUE) |
|
- endif(use_lto) |
|
-endif (WITH_EXAMPLES) |
|
Index: src/CMakeLists.txt |
|
--- src/CMakeLists.txt.orig 2020-04-25 14:01:23.000000000 +0200 |
|
+++ src/CMakeLists.txt 2020-04-29 08:14:33.404166000 +0200 |
|
@@ -12,23 +12,16 @@ |
|
endif() |
|
|
|
add_library(cbor STATIC ${SOURCES}) |
|
-add_library(cbor_shared SHARED ${SOURCES}) |
|
|
|
|
|
if (NOT ${CBOR_VERSION_MAJOR} EQUAL 0) |
|
MESSAGE(FATAL_ERROR "Change the shared library version scheme to reflect https://github.com/PJK/libcbor/issues/52.") |
|
endif() |
|
|
|
-set_target_properties(cbor_shared PROPERTIES |
|
- OUTPUT_NAME cbor |
|
- VERSION ${CBOR_VERSION} |
|
- MACHO_COMPATIBILITY_VERSION ${CBOR_VERSION_MAJOR}.${CBOR_VERSION_MINOR}.0 |
|
- SOVERSION ${CBOR_VERSION_MAJOR}.${CBOR_VERSION_MINOR}) |
|
- |
|
configure_file(libcbor.pc.in libcbor.pc @ONLY) |
|
|
|
# http://www.cmake.org/Wiki/CMake:Install_Commands |
|
-install(TARGETS cbor_shared |
|
+install(TARGETS cbor |
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} |
|
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} |
|
RUNTIME DESTINATION bin)
|
|
|