diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2014-05-08 14:41:12 +0400 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2014-05-08 14:41:12 +0400 |
| commit | 7466e7f10fb4813a6112682dff13de5fbdd981a7 (patch) | |
| tree | f975b5e464599ea21c17894c909144750904421c /CMakeLists.txt | |
| parent | 703ef720d364fcada5d2e382b487cd5299feac9f (diff) | |
| download | accel-ppp-7466e7f10fb4813a6112682dff13de5fbdd981a7.tar.gz accel-ppp-7466e7f10fb4813a6112682dff13de5fbdd981a7.zip | |
1.8.0 release
* major l2tp rewrite
* introduced ipoe (ipv4 only) module
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 7d52511f..c41f0e02 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ IF (NOT DEFINED LIB_SUFFIX) ENDIF (ARCH STREQUAL x86_64) ENDIF (NOT DEFINED LIB_SUFFIX) -IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT DEFINED IGNORE_GIT) +IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT IGNORE_GIT) EXECUTE_PROCESS( COMMAND git log --no-color COMMAND head -n1 @@ -29,9 +29,9 @@ IF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT DEFINED IGNORE_GIT) OUTPUT_VARIABLE ACCEL_PPP_VERSION ) STRING(STRIP ${ACCEL_PPP_VERSION} ACCEL_PPP_VERSION) -ELSE (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT DEFINED IGNORE_GIT) - SET (ACCEL_PPP_VERSION 1.8.0-beta) -ENDIF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT DEFINED IGNORE_GIT) +ELSE (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT IGNORE_GIT) + SET (ACCEL_PPP_VERSION 1.8.0) +ENDIF (EXISTS ${CMAKE_HOME_DIRECTORY}/.git AND NOT IGNORE_GIT) ADD_DEFINITIONS(-DACCEL_PPP_VERSION="${ACCEL_PPP_VERSION}") INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}) @@ -64,13 +64,17 @@ if (NOT BUILD_DRIVER_ONLY) add_subdirectory(accel-cmd) endif (NOT BUILD_DRIVER_ONLY) -if (BUILD_DRIVER OR BUILD_DRIVER_ONLY) - add_subdirectory(drivers/pptp) -endif (BUILD_DRIVER OR BUILD_DRIVER_ONLY) +if (BUILD_PPTP_DRIVER OR BUILD_DRIVER_ONLY) + if (BUILD_PPTP_DRIVER) + add_subdirectory(drivers/pptp) + endif (BUILD_PPTP_DRIVER) +endif (BUILD_PPTP_DRIVER OR BUILD_DRIVER_ONLY) -if (BUILD_IPOE_DRIVER) - add_subdirectory(drivers/ipoe) -endif (BUILD_IPOE_DRIVER) +if (BUILD_IPOE_DRIVER OR BUILD_DRIVER_ONLY) + if (BUILD_IPOE_DRIVER) + add_subdirectory(drivers/ipoe) + endif (BUILD_IPOE_DRIVER) +endif (BUILD_IPOE_DRIVER OR BUILD_DRIVER_ONLY) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) |