Skip to content

Commit abe080d

Browse files
authored
Merge pull request #5 from hyperledger/develop
Prepare for hunterization
2 parents e7188b8 + 1626993 commit abe080d

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

CMakeLists.txt

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ set(SOVERSION "${ED25519_MAJOR_VERSION}.${ED25519_MINOR_VERSION}.${ED25519_PATCH
66
project(ed25519 VERSION ${SOVERSION} LANGUAGES C CXX)
77

88
SET(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
9-
SET(CMAKE_CXX_FLAGS "-std=c++14 -Wall")
10-
SET(CMAKE_CXX_FLAGS_RELEASE "-O3")
11-
SET(CMAKE_CXX_FLAGS_DEBUG "-g -Wextra -O0 -fdiagnostics-color")
12-
SET(CMAKE_C_FLAGS "-Wall")
13-
SET(CMAKE_C_FLAGS_RELEASE "-O3 -funroll-loops -fomit-frame-pointer")
14-
SET(CMAKE_C_FLAGS_DEBUG "-g -Wextra -O0 -fdiagnostics-color ")
9+
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14 -Wall")
10+
SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
11+
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g -Wextra -O0 -fdiagnostics-color")
12+
SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
13+
SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O3 -funroll-loops -fomit-frame-pointer")
14+
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g -Wextra -O0 -fdiagnostics-color ")
1515
SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/Modules)
1616
SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
1717
SET(CMAKE_EXPORT_COMPILE_COMMANDS "ON")
@@ -83,11 +83,6 @@ add_library(ed25519 ${BUILD}
8383
$<TARGET_OBJECTS:${HASH}>
8484
$<TARGET_OBJECTS:${RANDOM}>
8585
)
86-
generate_export_header(ed25519)
87-
install(
88-
FILES ${CMAKE_CURRENT_BINARY_DIR}/ed25519_export.h
89-
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
90-
)
9186
set_target_properties(ed25519 PROPERTIES
9287
VERSION ${SOVERSION}
9388
SOVERSION ${SOVERSION}

0 commit comments

Comments
 (0)