Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

binpac: Minor style changes.

Browse source
This commit is contained in:
Jon Siwek 2010-11-02 10:57:24 -05:00 • committed by Tim Wojtulewicz
parent 32db4e4447
commit 8366dd6bcb
2 changed files with 20 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

31
tools/binpac/CMakeLists.txt
View file

@ -1,12 +1,10 @@
## ########################################################################
## CMake Configuration ## CMake Configuration
##
cmake_minimum_required(VERSION 2.8 FATAL_ERROR) cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
# Prohibit in-source builds. # Prohibit in-source builds.
string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" source_build) if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
if (source_build)
message(FATAL_ERROR "In-source builds are not allowed. Please use " message(FATAL_ERROR "In-source builds are not allowed. Please use "
"./configure to choose a build directory and " "./configure to choose a build directory and "
"initialize the build configuration.") "initialize the build configuration.")
@ -28,12 +26,13 @@ include(${build_options_file})
set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
## ########################################################################
## Project Configuration ## Project/Build Configuration
##
project(BinPAC) project(BinPAC)
file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" BINPAC_VERSION LIMIT_COUNT 1)
if (ENABLE_DEBUG AND ENABLE_RELEASE) if (ENABLE_DEBUG AND ENABLE_RELEASE)
set(CMAKE_BUILD_TYPE RelWithDebInfo) set(CMAKE_BUILD_TYPE RelWithDebInfo)
elseif (ENABLE_DEBUG AND NOT ENABLE_RELEASE) elseif (ENABLE_DEBUG AND NOT ENABLE_RELEASE)
@ -57,34 +56,28 @@ if (NOT EXTRA_COMPILE_FLAGS)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_COMPILE_FLAGS}") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${EXTRA_COMPILE_FLAGS}")
endif () endif ()
## ########################################################################
## Dependency Configuration ## Dependency Configuration
##
find_package(FLEX REQUIRED) find_package(FLEX REQUIRED)
find_package(BISON REQUIRED) find_package(BISON REQUIRED)
## ########################################################################
## Configuration Checks/Tests ## System Introspection
##
file(STRINGS "${CMAKE_CURRENT_SOURCE_DIR}/VERSION" BINPAC_VERSION LIMIT_COUNT 1)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in
${CMAKE_CURRENT_BINARY_DIR}/config.h) ${CMAKE_CURRENT_BINARY_DIR}/config.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR})
## ########################################################################
## Recuse on sub-directories ## Recurse on sub-directories
##
add_subdirectory(lib) add_subdirectory(lib)
add_subdirectory(src) add_subdirectory(src)
## ########################################################################
## Build Summary ## Build Summary
##
if (BinPAC_SKIP_INSTALL) if (BinPAC_SKIP_INSTALL)
set(binpac_install_summary "Install skipped") set(binpac_install_summary "Install skipped")

18
tools/binpac/lib/CMakeLists.txt
View file

@ -9,10 +9,7 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/binpac.h.in
include_directories(${CMAKE_CURRENT_SOURCE_DIR} include_directories(${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}) ${CMAKE_CURRENT_BINARY_DIR})
set(binpac_headers
set(binpac_lib_SRCS
binpac_buffer.cc
binpac_bytestring.cc
${CMAKE_CURRENT_BINARY_DIR}/binpac.h ${CMAKE_CURRENT_BINARY_DIR}/binpac.h
binpac_analyzer.h binpac_analyzer.h
binpac_buffer.h binpac_buffer.h
@ -21,6 +18,12 @@ set(binpac_lib_SRCS
binpac_regex.h binpac_regex.h
) )
set(binpac_lib_SRCS
binpac_buffer.cc
binpac_bytestring.cc
${binpac_headers}
)
add_library(binpac_lib STATIC ${binpac_lib_SRCS}) add_library(binpac_lib STATIC ${binpac_lib_SRCS})
set_target_properties(binpac_lib PROPERTIES OUTPUT_NAME binpac) set_target_properties(binpac_lib PROPERTIES OUTPUT_NAME binpac)
@ -28,12 +31,7 @@ set_target_properties(binpac_lib PROPERTIES OUTPUT_NAME binpac)
if (NOT BinPAC_SKIP_INSTALL) if (NOT BinPAC_SKIP_INSTALL)
install(TARGETS binpac_lib DESTINATION lib) install(TARGETS binpac_lib DESTINATION lib)
install(FILES install(FILES
${CMAKE_CURRENT_BINARY_DIR}/binpac.h ${binpac_headers}
binpac_analyzer.h
binpac_buffer.h
binpac_bytestring.h
binpac_exception.h
binpac_regex.h
DESTINATION DESTINATION
include include
) )