Improvements in the cmake builder

2012-02-19 23:09:03 +01:00 · 2012-02-19 23:09:03 +01:00 · 38d2a49967
commit 38d2a49967
parent 89035cdb2c
11 changed files with 139 additions and 56 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -38,34 +38,41 @@
 # This file contains the top level CMakeLists.txt logic for the 
 # SCL software package.

+PROJECT(SCL)
+SET(SCL_VERSION_MAJOR 0)
+SET(SCL_VERSION_MINOR 5-dev)
+SET(SCL_VERSION ${SCL_VERSION_MAJOR}.${SCL_VERSION_MINOR})
+
 # Minimum required version of CMake
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 IF(COMMAND CMAKE_POLICY)
    CMAKE_POLICY(SET CMP0003 NEW)
 ENDIF(COMMAND CMAKE_POLICY)

-# set CMake project name
-PROJECT(SCL)
+IF (NOT MSVC)
+	IF( NOT DEFINED SCL_BUILD_TYPE )
+		SET( SCL_BUILD_TYPE "Debug" CACHE STRING "Build type" ) # By default set debug build
+	ENDIF( NOT DEFINED SCL_BUILD_TYPE )
+	SET( CMAKE_BUILD_TYPE ${SCL_BUILD_TYPE} CACHE INTERNAL "Build type,
+		immutable" FORCE )
+ENDIF(NOT MSVC)

-if( CMAKE_BUILD_TYPE STREQUAL "" )
-  message( "-- Debug build - to override, rerun cmake with '-DCMAKE_BUILD_TYPE=Release'." )
-  set( CMAKE_BUILD_TYPE Debug )
-endif()
+# Define helper macro OPTION_WITH_DEFAULT
+MACRO( OPTION_WITH_DEFAULT OPTION_NAME OPTION_STRING OPTION_DEFAULT )
+	IF( NOT DEFINED ${OPTION_NAME} )
+		SET( ${OPTION_NAME} ${OPTION_DEFAULT} )
+	ENDIF( NOT DEFINED ${OPTION_NAME} )
+	OPTION( ${OPTION_NAME} "${OPTION_STRING}" ${${OPTION_NAME}} )
+ENDMACRO( OPTION_WITH_DEFAULT OPTION_NAME OPTION_STRING OPTION_DEFAULT )

 # build shared libs by default
-OPTION(BUILD_SHARED_LIBS "Build shared libraries" ON)
+OPTION_WITH_DEFAULT(SCL_BUILD_SHARED_LIBS "Build shared libs" ON )

 # build static libs by default
-OPTION(BUILD_STATIC_LIBS "Build static libraries" OFF)
+OPTION_WITH_DEFAULT(SCL_BUILD_STATIC_LIBS "Build static libs" OFF)

-OPTION(PYTHON_GENERATOR "Compile fedex_plus_python" ON)
-OPTION(CPP_GENERATOR "Compile fedex_plus" ON)
-
-# Set version
-SET(SCL_VERSION_MAJOR "3")
-SET(SCL_VERSION_MINOR "2")
-SET(SCL_VERSION_PATCH "0")
-SET(SCL_VERSION "${SCL_VERSION_MAJOR}.${SCL_VERSION_MINOR}.${SCL_VERSION_PATCH}")
+OPTION_WITH_DEFAULT(SCL_PYTHON_GENERATOR "Compile fedex_plus_python" ON)
+OPTION_WITH_DEFAULT(SCL_CPP_GENERATOR "Compile fedex_plus" ON)

 # CMake derives much of its functionality from modules, typically
 # stored in one directory - let CMake know where to find them.
@ -100,16 +107,28 @@ ENDIF(NOT WIN32)

 #---------------------------------------------------------------------
 # Testing option
-OPTION( ENABLE_TESTING "Enable unittesting framework" OFF )
-IF(ENABLE_TESTING)
-    set( CMAKE_EXE_LINKER_FLAGS "-fprofile-arcs -ftest-coverage" ) #for code coverage
-    set( CMAKE_SHARED_LINKER_FLAGS "-fprofile-arcs -ftest-coverage" )
-    if( NOT DEFINED BUILD_SCHEMAS )
-        set( BUILD_SCHEMAS "ALL" ) #test all schemas, unless otherwise specified
+OPTION_WITH_DEFAULT( SCL_ENABLE_TESTING "Enable unittesting framework" ON )
+IF(SCL_ENABLE_TESTING)
+    if( NOT DEFINED SCL_BUILD_SCHEMAS )
+        set( SCL_BUILD_SCHEMAS "ALL" ) #test all schemas, unless otherwise specified
    endif()
    INCLUDE(CTest)
    ENABLE_TESTING()
-ENDIF(ENABLE_TESTING)
+ENDIF(SCL_ENABLE_TESTING)
+
+#---------------------------------------------------------------------
+# Coverage option
+OPTION_WITH_DEFAULT( SCL_ENABLE_COVERAGE "Enable code coverage test" OFF )
+IF(SCL_ENABLE_COVERAGE)
+    SET(SCL_ENABLE_TESTING ON CACHE BOOL "Testing enabled by coverage option" FORCE)
+    # build static libs, better coverage report
+    SET(SCL_BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared libs" FORCE )
+    SET(SCL_BUILD_STATIC_LIBS ON CACHE BOOL "Build static libs" FORCE )
+    SET(CMAKE_CXX_FLAGS_DEBUG "-O0 -g -fprofile-arcs -ftest-coverage" CACHE STRING "Extra compile flags required by code coverage" FORCE)
+    SET(CMAKE_C_FLAGS_DEBUG "-O0 -g -fprofile-arcs -ftest-coverage" CACHE STRING "Extra compile flags required by code coverage" FORCE)
+    SET(CMAKE_MODULE_LINKER_FLAGS_DEBUG "-fprofile-arcs -ftest-coverage" CACHE STRING "Extra linker flags required by code coverage" FORCE)
+    SET(SCL_BUILD_TYPE "Debug" CACHE STRING "Build type required by testing framework" FORCE)
+ENDIF(SCL_ENABLE_COVERAGE)

 #---------------------------------------------------------------------
 # The following logic is what allows binaries to run successfully in 
@ -174,23 +193,21 @@ ENDFOREACH()
 # The location in which to install SCL. Need a good Debug location 
 # for Windows.  Only do this if CMAKE_INSTALL_PREFIX hasn't been set
 # already, to try and allow parent builds (if any) some control.
-IF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
-    IF(NOT WIN32)
-        IF ("${CMAKE_BUILD_TYPE}" MATCHES "Release")
-            SET(CMAKE_INSTALL_PREFIX "/usr")
-        ELSEIF ("${CMAKE_BUILD_TYPE}" MATCHES "Debug")
-            SET(CMAKE_INSTALL_PREFIX "${SCL_SOURCE_DIR}/../scl-install")
-            MESSAGE("---  Setting debug install dir to ${CMAKE_INSTALL_PREFIX}")
-        ELSE("${CMAKE_BUILD_TYPE}" MATCHES "Release")
-            SET(CMAKE_INSTALL_PREFIX "/usr/local")
-        ENDIF ("${CMAKE_BUILD_TYPE}" MATCHES "Release")
-    ENDIF(NOT WIN32)
-    SET(CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE STRING "SCL install prefix" FORCE)
-    SET(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT 0)
-ENDIF(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+IF(NOT WIN32)
+    IF (${CMAKE_BUILD_TYPE} MATCHES "Debug")
+        SET(SCL_INSTALL_PREFIX "${SCL_SOURCE_DIR}/../scl-install")
+    ELSE()
+        SET(SCL_INSTALL_PREFIX "/usr/local")
+    ENDIF()
+ENDIF(NOT WIN32)
+SET( SCL_INSTALL_PREFIX ${SCL_INSTALL_PREFIX} CACHE
+    PATH "Install prefix prepended to target to create install location" )
+SET( CMAKE_INSTALL_PREFIX ${SCL_INSTALL_PREFIX} CACHE INTERNAL "Prefix
+    prepended to install directories if target destination is not absolute,
+    immutable" FORCE )

-OPTION(SCL-BUILD_EXPRESS_ONLY "Only build express parser." OFF)
-MARK_AS_ADVANCED(SCL-BUILD_EXPRESS_ONLY)
+OPTION(SCL_BUILD_EXPRESS_ONLY "Only build express parser." OFF)
+MARK_AS_ADVANCED(SCL_BUILD_EXPRESS_ONLY)

 # Take the scl config file template and copy it to the build directory so CMake
 # scripts can append to it if need be
@ -277,3 +294,31 @@ ADD_SUBDIRECTORY(doc)
 # this is for testing - 'make core' builds everything that isn't generated
 add_custom_target( core )
 add_dependencies( core stepdai check-express stepeditor fedex_plus )
+
+###############################################################################
+# SCL Packaging                                                               #
+# $make package                                                               #
+###############################################################################
+
+SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "STEP Class Library")
+SET(CPACK_SET_DESTDIR "ON")
+
+SET(CPACK_PACKAGE_VERSION_MAJOR ${SCL_VERSION_MAJOR})
+SET(CPACK_PACKAGE_VERSION_MINOR ${SCL_VERSION_MINOR})
+SET(CPACK_PACKAGE_NAME SCL )
+
+SET(CPACK_PACKAGE_CONTACT "SCL Developers <scl-dev@googlegroups.com>")
+INCLUDE(CPack)
+
+########################################################################################
+# Uninstall code                                                                       #
+# From http://www.cmake.org/Wiki/CMake_FAQ#Can_I_do_.22make_uninstall.22_with_CMake.3F #
+# ######################################################################################
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/cmake/cmake_uninstall.cmake.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+    IMMEDIATE @ONLY)
+
+add_custom_target(uninstall
+    COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake)
+
--- a/cmake/SCL_Utils.cmake
+++ b/cmake/SCL_Utils.cmake
@ -33,15 +33,15 @@ MACRO(SCL_ADDLIB libname srcs libs)
  STRING(REGEX REPLACE " " ";" libslist1 "${libs}")
  STRING(REGEX REPLACE "-framework;" "-framework " libslist "${libslist1}")
  DLL_DEFINE(${libname})
-  IF(BUILD_SHARED_LIBS)
+  IF(SCL_BUILD_SHARED_LIBS)
 	  add_library(${libname} SHARED ${srcslist})
 	  if(NOT ${libs} MATCHES "NONE")
 		  target_link_libraries(${libname} ${libslist})
 	  endif(NOT ${libs} MATCHES "NONE")
 	  SET_TARGET_PROPERTIES(${libname} PROPERTIES VERSION ${SCL_VERSION_MAJOR}.${SCL_VERSION_MINOR} SOVERSION ${SCL_VERSION_MAJOR} )
 	  INSTALL(TARGETS ${libname} DESTINATION lib)
-  ENDIF(BUILD_SHARED_LIBS)
-  IF(BUILD_STATIC_LIBS AND NOT MSVC)
+  ENDIF(SCL_BUILD_SHARED_LIBS)
+  IF(SCL_BUILD_STATIC_LIBS AND NOT MSVC)
 	  add_library(${libname}-static STATIC ${srcslist})
 	  if(NOT ${libs} MATCHES "NONE")
 		  target_link_libraries(${libname}-static ${libslist})
@ -56,7 +56,7 @@ MACRO(SCL_ADDLIB libname srcs libs)
 		  SET_TARGET_PROPERTIES(${libname}-static PROPERTIES PREFIX "lib")
 	  ENDIF(WIN32)
 	  INSTALL(TARGETS ${libname}-static DESTINATION lib)
-  ENDIF(BUILD_STATIC_LIBS AND NOT MSVC)
+  ENDIF(SCL_BUILD_STATIC_LIBS AND NOT MSVC)
  # Enable extra compiler flags if local libraries and/or global options dictate
  SET(LOCAL_COMPILE_FLAGS "")
  FOREACH(extraarg ${ARGN})
--- a/cmake/cmake_uninstall.cmake.in
+++ b/cmake/cmake_uninstall.cmake.in
@ -0,0 +1,22 @@
+if (NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+    message(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
+endif(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
+
+file(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
+string(REGEX REPLACE "\n" ";" files "${files}")
+list(REVERSE files)
+foreach (file ${files})
+    message(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
+    if (EXISTS "$ENV{DESTDIR}${file}")
+        execute_process(
+            COMMAND ${CMAKE_COMMAND} -E remove "$ENV{DESTDIR}${file}"
+            OUTPUT_VARIABLE rm_out
+            RESULT_VARIABLE rm_retval
+        )
+        if(NOT ${rm_retval} EQUAL 0)
+            message(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
+        endif (NOT ${rm_retval} EQUAL 0)
+    else (EXISTS "$ENV{DESTDIR}${file}")
+        message(STATUS "File \"$ENV{DESTDIR}${file}\" does not exist.")
+    endif (EXISTS "$ENV{DESTDIR}${file}")
+endforeach(file)
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@ -8,7 +8,7 @@ FUNCTION( TESTABLE_TARGET target )
 ENDFUNCTION( TESTABLE_TARGET )

 # To build one or more schemas, configure with 
-# 'cmake -DBUILD_SCHEMAS="path/to/schema.exp;path/to/schema2.exp"
+# 'cmake -DSCL_BUILD_SCHEMAS="path/to/schema.exp;path/to/schema2.exp"

 # This function runs fedex on one express file. The generated source goes in a dir 
 # in the build dir, and it is compiled into a library. A p21read executable is 
@ -120,11 +120,11 @@ FUNCTION(BUILD_A_SCHEMA SCHEMA_FILE)

 ENDFUNCTION(BUILD_A_SCHEMA)

-if( DEFINED BUILD_SCHEMAS )
-    if( BUILD_SCHEMAS STREQUAL "ALL" )
-        file( GLOB_RECURSE BUILD_SCHEMAS ${SCL_SOURCE_DIR}/data/*.exp )
+if( DEFINED SCL_BUILD_SCHEMAS )
+    if( SCL_BUILD_SCHEMAS STREQUAL "ALL" )
+        file( GLOB_RECURSE SCL_BUILD_SCHEMAS ${SCL_SOURCE_DIR}/data/*.exp )
    endif()
-    foreach( ap ${BUILD_SCHEMAS} )
+    foreach( ap ${SCL_BUILD_SCHEMAS} )
        BUILD_A_SCHEMA( ${ap} )
    endforeach()
 endif()
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@ -4,4 +4,6 @@ SET(scl_MANS
 	man/man1/fedex_plus.1 
 	man/man1/mkProbe.1
 )
-INSTALL(FILES ${scl_MANS} DESTINATION ${MAN_DIR}/man1)
+IF(NOT WIN32)
+  INSTALL(FILES ${scl_MANS} DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
+ENDIF(NOT WIN32)
--- a/src/cldai/CMakeLists.txt
+++ b/src/cldai/CMakeLists.txt
@ -42,5 +42,7 @@ include_directories(
 SCL_ADDLIB(stepdai "${LIBSTEPDAI_SRCS}" "steputils")

 if(APPLE)
-    set_target_properties(stepdai PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+    if(SCL_BUILD_SHARED_LIBS)
+        set_target_properties(stepdai PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+    endif(SCL_BUILD_SHARED_LIBS)
 endif(APPLE)
--- a/src/cleditor/CMakeLists.txt
+++ b/src/cleditor/CMakeLists.txt
@ -50,5 +50,7 @@ endif()
 SCL_ADDLIB(stepeditor "${LIBSTEPEDITOR_SRCS}" stepcore stepdai steputils)

 if(APPLE)
-    set_target_properties(stepeditor PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+    if(SCL_BUILD_SHARED_LIBS)
+        set_target_properties(stepeditor PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+    endif(SCL_BUILD_SHARED_LIBS)
 endif(APPLE)
--- a/src/clstepcore/CMakeLists.txt
+++ b/src/clstepcore/CMakeLists.txt
@ -85,5 +85,7 @@ include_directories(

 SCL_ADDLIB(stepcore "${LIBSTEPCORE_SRCS} ${LIBDEPEND_SRCS}" "express steputils stepdai")
 if(APPLE)
-    set_target_properties(stepcore PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+    if(SCL_BUILD_SHARED_LIBS)
+        set_target_properties(stepcore PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+    endif(SCL_BUILD_SHARED_LIBS)
 endif(APPLE)
--- a/src/clutils/CMakeLists.txt
+++ b/src/clutils/CMakeLists.txt
@ -42,5 +42,7 @@ IF(MSVC OR BORLAND)
 ENDIF()

 if(APPLE)
-    set_target_properties(steputils PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+    if(SCL_BUILD_SHARED_LIBS)
+        set_target_properties(steputils PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+    endif(SCL_BUILD_SHARED_LIBS)
 endif(APPLE)
--- a/src/exppp/CMakeLists.txt
+++ b/src/exppp/CMakeLists.txt
@ -24,10 +24,14 @@ add_definitions( -D__STDC__ )
 endif()

 SCL_ADDLIB(libexppp "${LIBEXPPP_SOURCES}" "express base")
-set_target_properties(libexppp PROPERTIES PREFIX "")
+if(SCL_BUILD_SHARED_LIBS)
+    set_target_properties(libexppp PROPERTIES PREFIX "")
+endif(SCL_BUILD_SHARED_LIBS)

 #SCL_ADDEXEC(exppp "${EXPPP_SOURCES}" "libexppp express")

 if(APPLE)
-    set_target_properties(libexppp PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+    if(SCL_BUILD_SHARED_LIBS)
+        set_target_properties(libexppp PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+    endif(SCL_BUILD_SHARED_LIBS)
 endif(APPLE)
--- a/src/express/CMakeLists.txt
+++ b/src/express/CMakeLists.txt
@ -87,7 +87,9 @@ endif()
 SCL_ADDLIB(express "${EXPRESS_SOURCES}" "base")

 if(APPLE)
-    set_target_properties(express PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+    if(SCL_BUILD_SHARED_LIBS)
+        set_target_properties(express PROPERTIES LINK_FLAGS "-flat_namespace -undefined suppress")
+    endif(SCL_BUILD_SHARED_LIBS)
 endif(APPLE)

 SCL_ADDEXEC("check-express" "${CHECK_EXPRESS_SOURCES} ${CHECK_EXPRESS_EXTRA_SOURCES}" express)