Commit 5f91016c authored by kfox's avatar kfox

Merge branch 'master' of https://githubenterprise.parc.com/kfox/Athena into...

Merge branch 'master' of https://githubenterprise.parc.com/kfox/Athena into 3987-kev-configurationRestoration

merge
parents a3200fdd 33b92693
......@@ -14,6 +14,8 @@ include( detectCacheSize )
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
set(CMAKE_C_FLAGS_NOPANTS "${CMAKE_C_FLAGS_NOPANTS} -O3 -DNDEBUG -DAthena_DISABLE_VALIDATION")
include_directories(${PROJECT_SOURCE_DIR} ${PROJECT_BINARY_DIR}/ccnx/forwarder/athena)
include_directories($ENV{CCNX_DEPENDENCIES}/include)
set(OPENSSL_ROOT_DIR $ENV{CCNX_DEPENDENCIES})
......@@ -39,10 +41,6 @@ find_package ( Threads REQUIRED )
find_package ( OpenSSL REQUIRED )
include_directories(${PROJECT_BINARY_DIR}/ccnx/forwarder/athena
${PROJECT_SOURCE_DIR}
)
find_package( Doxygen )
set(ATHENA_LINK_LIBRARIES
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment