diff options
| author | Alan Antonuk <aega@med.umich.edu> | 2012-05-22 11:11:13 -0400 |
|---|---|---|
| committer | Alan Antonuk <aega@med.umich.edu> | 2012-05-24 15:35:19 -0400 |
| commit | 3747a8d87b351f2b253faddb8e1f12f158202480 (patch) | |
| tree | c7bacbdf2c7722e0626ce8722b8044b3730dd602 /CMakeLists.txt | |
| parent | 7a74c3574afb32ab31dc5f946afbf89f3022a36d (diff) | |
| download | rabbitmq-c-github-ask-3747a8d87b351f2b253faddb8e1f12f158202480.tar.gz | |
Making the CMakeLists.txt work with cmake v2.6
Removing the ExternalProject code as it makes more sense
to use the git submodule code.
The CMakeLists.txt can now be made to work with cmake-v2.6
as a result
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 46 |
1 files changed, 12 insertions, 34 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b4f95e2..d594aa0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 2.6) project(rabbitmq-c "C") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake) @@ -23,44 +23,22 @@ endif (CHECK_PYTHON_JSON_FAILED) include(TestCInline) -option(FETCH_CODEGEN_FROM_GIT "Fetch codegen directly from the git repository" OFF) - -set(CODEGEN_GIT_TAG rabbitmq_v2_5_1 CACHE STRING "Git tag in rabbitmq-codegen to fetch with FETCH_CODEGEN_FROM_GIT") -if (FETCH_CODEGEN_FROM_GIT) - include(ExternalProject) - ExternalProject_Add( - amqp_codegen - GIT_REPOSITORY https://github.com/rabbitmq/rabbitmq-codegen.git - GIT_TAG ${CODEGEN_GIT_TAG} - CONFIGURE_COMMAND "" - UPDATE_COMMAND "" - BUILD_COMMAND "" - INSTALL_COMMAND "" - TEST_COMMAND "") - - ExternalProject_Get_Property(amqp_codegen SOURCE_DIR) - set(AMQP_CODEGEN_DIR ${SOURCE_DIR} CACHE PATH "Path to rabbitmq-codegen" FORCE) - SET(AMQP_CODEGEN_TARGET amqp_codegen) - message(STATUS "Using amqp_codegen.py in ${AMQP_CODEGEN_DIR}") -else (FETCH_CODEGEN_FROM_GIT) - find_path(RABBITMQ_CODEGEN_DIR - amqp_codegen.py - PATHS ${CMAKE_SOURCE_DIR}/rabbitmq-codegen - ${CMAKE_SOURCE_DIR}/../rabbitmq-codegen - ${CMAKE_SOURCE_DIR}/codegen +find_path(RABBITMQ_CODEGEN_DIR + amqp_codegen.py + PATHS ${CMAKE_SOURCE_DIR}/codegen + ${CMAKE_SOURCE_DIR}/rabbitmq-codegen + ${CMAKE_SOURCE_DIR}/../rabbitmq-codegen DOC "Path to directory containing amqp_codegen.py (rabbitmq-codegen)" NO_DEFAULT_PATH ) - if (RABBITMQ_CODEGEN_DIR STREQUAL "RABBITMQ_CODEGEN_DIR-NOTFOUND") - message(SEND_ERROR "Cannot find rabbitmq-codegen, set RABBITMQ_CODEGEN_DIR to a rabbitmq-codegen checkout, or set FETCH_CODEGEN_FROM_GIT to download it from git automatically") - else () - message(STATUS "Using amqp_codegen.py in ${RABBITMQ_CODEGEN_DIR}") - endif() - - set(AMQP_CODEGEN_DIR ${RABBITMQ_CODEGEN_DIR} CACHE PATH "Path to rabbitmq-codegen" FORCE) -endif (FETCH_CODEGEN_FROM_GIT) +if (RABBITMQ_CODEGEN_DIR STREQUAL "RABBITMQ_CODEGEN_DIR-NOTFOUND") + message(SEND_ERROR "Cannot find amqp_codegen.py, did you forget to:\n\ngit submodule init\ngit submodule update\n?") +else () + message(STATUS "Using amqp_codegen.py in ${RABBITMQ_CODEGEN_DIR}") +endif() +set(AMQP_CODEGEN_DIR ${RABBITMQ_CODEGEN_DIR} CACHE PATH "Path to rabbitmq-codegen" FORCE) mark_as_advanced(AMQP_CODEGEN_DIR) find_package(POPT) |