Browse Source

Build tidyups.

cl-refactor
Gav Wood 11 years ago
parent
commit
2bb7bf4df3
  1. 27
      CMakeLists.txt

27
CMakeLists.txt

@ -182,7 +182,9 @@ else()
/usr/include /usr/include
/usr/local/include /usr/local/include
) )
if ( LEVELDB_ID ) if ( LEVELDB_ID STREQUAL "LEVELDB_ID-NOTFOUND" )
message(FATAL_ERROR "Failed to find the LevelDB headers")
else ()
message(STATUS "Found LevelDB Headers") message(STATUS "Found LevelDB Headers")
# Check for accessory dev libraries leveldb and miniupnpc # Check for accessory dev libraries leveldb and miniupnpc
@ -193,21 +195,21 @@ else()
/opt/local/lib /opt/local/lib
/usr/lib/*/ /usr/lib/*/
) )
if ( LEVELDB_LS ) if ( LEVELDB_LS STREQUAL "LEVELDB_LS-NOTFOUND" )
message(FATAL_ERROR "Failed to find the LevelDB Library!")
else ()
message(STATUS "Found LevelDB Library: ${LEVELDB_LS}") message(STATUS "Found LevelDB Library: ${LEVELDB_LS}")
add_definitions(-DETH_LEVELDB) add_definitions(-DETH_LEVELDB)
else ()
message(FATAL_ERROR "Failed to find the LevelDB Library!")
endif () endif ()
else ()
message(FATAL_ERROR "Failed to find the LevelDB headers")
endif () endif ()
find_path( PYTHON_ID pyconfig.h find_path( PYTHON_ID pyconfig.h
/usr/include/python2.7 /usr/include/python2.7
/usr/local/include/python2.7 /usr/local/include/python2.7
) )
if ( PYTHON_ID ) if ( PYTHON_ID STREQUAL "PYTHON_ID-NOTFOUND" )
message(STATUS "Failed to find the Python-2.7 headers")
else ()
message(STATUS "Found Python-2.7 Headers: ${PYTHON_ID}") message(STATUS "Found Python-2.7 Headers: ${PYTHON_ID}")
# Check for accessory dev libraries leveldb and miniupnpc # Check for accessory dev libraries leveldb and miniupnpc
@ -218,14 +220,14 @@ else()
/opt/local/lib /opt/local/lib
/usr/lib/*/ /usr/lib/*/
) )
if ( PYTHON_LS ) if ( PYTHON_LS STREQUAL "PYTHON_LS-NOTFOUND" )
message(STATUS "Failed to find the Python-2.7 Library!")
set(PYTHON_ID)
set(PYTHON_LS)
else ()
message(STATUS "Found Python-2.7 Library: ${PYTHON_LS}") message(STATUS "Found Python-2.7 Library: ${PYTHON_LS}")
add_definitions(-DETH_PYTHON) add_definitions(-DETH_PYTHON)
else ()
message(FATAL_ERROR "Failed to find the Python-2.7 Library!")
endif () endif ()
else ()
message(FATAL_ERROR "Failed to find the Python-2.7 headers")
endif () endif ()
find_path( MINIUPNPC_ID miniupnpc/miniwget.h find_path( MINIUPNPC_ID miniupnpc/miniwget.h
@ -252,7 +254,6 @@ else()
message(STATUS "Failed to find the miniupnpc headers!") message(STATUS "Failed to find the miniupnpc headers!")
endif () endif ()
find_path( JSONRPC_ID jsonrpc/rpc.h find_path( JSONRPC_ID jsonrpc/rpc.h
/usr/include /usr/include
/usr/local/include /usr/local/include

Loading…
Cancel
Save