Changeset 5971 for branches/newapi

Timestamp:

12/31/07 09:03:01 (11 months ago)

Author:

erijo

Message:

Refactored cmake code

Location:

branches/newapi/licq

Files:

• cmake/Modules/BuildTypeCoverage.cmake (added)
• cmake/Modules/DefineCompilerFlags.cmake (added)
• cmake/Modules/DefineProjectDefaults.cmake (added)
• cmake/Modules/DoxygenDocsTarget.cmake (added)
• CMakeLists.txt (modified) (6 diffs)

branches/newapi/licq/CMakeLists.txt

@@ -8 +8 @@
 include(DetermineDlopenBinding)
 include(MacroEnsureVersion)
-include(TestCXXAcceptsFlag)
 
+# Default settings
+include(DefineProjectDefaults)
 
-# Use DEBUG as default build type for now
-if (NOT CMAKE_BUILD_TYPE)
-  set(CMAKE_BUILD_TYPE Debug CACHE STRING
-    "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel Coverage."
-    FORCE)
-endif (NOT CMAKE_BUILD_TYPE)
+# Configure compiler flags
+include(DefineCompilerFlags)
 
-# Define DEBUG when doing debug builds.
-set(CMAKE_CXX_FLAGS_DEBUG "-g -DDEBUG" CACHE STRING
-  "Flags used by the compiler during debug builds." FORCE)
-set(CMAKE_C_FLAGS_DEBUG "-g -DDEBUG" CACHE STRING
-  "Flags used by the compiler during debug builds." FORCE)
+# Adds a new build type: coverage
+include(BuildTypeCoverage)
 
-
-################################################################################
-# Adds a new build type: coverage
-################################################################################
-
-set(CMAKE_CXX_FLAGS_COVERAGE "-g -DDEBUG -O0 -Wall -fprofile-arcs -ftest-coverage"
-  CACHE STRING "Flags used by the C++ compiler during coverage builds." FORCE)
-
-set(CMAKE_C_FLAGS_COVERAGE "-g -DDEBUG -O0 -Wall -fprofile-arcs -ftest-coverage"
-  CACHE STRING "Flags used by the C compiler during coverage builds." FORCE)
-
-set(CMAKE_EXE_LINKER_FLAGS_COVERAGE "-fprofile-arcs -ftest-coverage"
-  CACHE STRING "Flags used for linking binaries during coverage builds." FORCE)
-
-set(CMAKE_SHARED_LINKER_FLAGS_COVERAGE "-fprofile-arcs -ftest-coverage"
-  CACHE STRING "Flags used by the shared libraries linker during coverage builds."
-  FORCE)
-
-mark_as_advanced(CMAKE_CXX_FLAGS_COVERAGE CMAKE_C_FLAGS_COVERAGE
-  CMAKE_EXE_LINKER_FLAGS_COVERAGE CMAKE_SHARED_LINKER_FLAGS_COVERAGE)
-
+# Unit-test stuff
 string(TOUPPER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE)
 string(COMPARE EQUAL ${CMAKE_BUILD_TYPE} "COVERAGE" UNIT_TESTS_COVERAGE)
@@ -56 +30 @@
 endif (UNIT_TESTS_COVERAGE)
 
-
 # Option to control building and running of unit-tests
 option(BUILD_UNIT_TESTS "Build unit-tests" ON)
@@ -67 +40 @@
   set(RUN_UNIT_TESTS OFF)
 endif (BUILD_UNIT_TESTS)
-
-
-# Don't link executable with -rpath
-SET(CMAKE_SKIP_RPATH ON)
-
-
-# Configure compiler flags
-check_cxx_accepts_flag(-Wall CXX_ACCEPTS_WALL)
-if (CXX_ACCEPTS_WALL)
-  add_definitions(-Wall)
-endif (CXX_ACCEPTS_WALL)
-
-check_cxx_accepts_flag(-Wextra CXX_ACCEPTS_WEXTRA)
-if (CXX_ACCEPTS_WEXTRA)
-  add_definitions(-Wextra)
-endif (CXX_ACCEPTS_WEXTRA)
-
-## -fvisibility=hidden does not work with all boost libs yet
-# if (CMAKE_COMPILER_IS_GNUCXX)
-#   check_cxx_accepts_flag(-fvisibility=hidden CXX_ACCEPTS_FVISIBILITY)
-#   if (CXX_ACCEPTS_FVISIBILITY)
-#     add_definitions(-fvisibility=hidden)
-#     add_definitions(-DLICQ_HAVE_GCC_VISIBILITY)    
-#
-#     # Only add -fvisibility-inlines-hidden for g++ versions >= 4.2 
-#     exec_program(${CMAKE_CXX_COMPILER} ARGS -dumpversion
-#       OUTPUT_VARIABLE gxx_version)
-#     macro_ensure_version("4.2.0" "${gxx_version}" GXX_IS_NEWER_THAN_4_2)
-#     if (GXX_IS_NEWER_THAN_4_2)
-#       set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
-#     endif (GXX_IS_NEWER_THAN_4_2)
-#   endif (CXX_ACCEPTS_FVISIBILITY)
-# endif (CMAKE_COMPILER_IS_GNUCXX)
 
 
@@ -146 +86 @@
 check_function_exists(strerror HAVE_STRERROR)
 
-
 # To find licq directory (public headers)
 include_directories(BEFORE ${PROJECT_SOURCE_DIR})
@@ -157 +96 @@
 include_directories(BEFORE ${CMAKE_CURRENT_BINARY_DIR})
 
-
 # Generate config.h
 configure_file(
@@ -167 +105 @@
 include(cmake/LicqVersion.cmake)
 
-
-# Command to generate doxygen docs (make docs)
-add_custom_target(docs
-  doxygen ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile 
-  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-  COMMENT "Generating doxygen documentation" VERBATIM
-)
-
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.cmake
-  ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-  @ONLY
-)
-
+# Target to generate doxygen docs (make docs)
+include(DoxygenDocsTarget)
 
 add_subdirectory(bin)