This repository was archived by the owner on May 27, 2025. It is now read-only.

fix (some) build errors for new software versions #67

Open

mimhoff wants to merge 1,070 commits into acfr:master from mimhoff:master

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -12,3 +12,6 @@ doc/generated @@
     tags
     compile_commands.json
     .ycm_extra_conf.py
+    python/comma_py.egg-info/
+    python/dist/
+    build

AUTHORS

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,4 +1,4 @@
  
      Vsevolod Vlaskine <vsevolod.vlaskine@gmail.com>

      Cedric Wohlleber <c.wohlleber@acfr.usyd.edu.au>

      Matthew Herrmann <matthewinrandwick@gmail.com>

      James Underwood <j.underwood@acfr.usyd.edu.au>

    Vsevolod Vlaskine <vsevolod.vlaskine@gmail.com>

    Cedric Wohlleber <c.wohlleber@acfr.usyd.edu.au>

    Matthew Herrmann <matthewinrandwick@gmail.com>

    James Underwood <j.underwood@acfr.usyd.edu.au>

CMakeFiles/FindComma.cmake

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -3,10 +3,10 @@
  
    # The following variables are set if comma is found.

    #  comma_FOUND         - Set to true when comma is found.

    #  comma_USE_FILE      - CMake file to use comma.

    #  comma_MAJOR_VERSION - The comma major version number.

    #  comma_MINOR_VERSION - The comma minor version number

    #  comma_version_major - The comma major version number.

    #  comma_version_minor - The comma minor version number

    #                       (odd non-release).

    #  comma_BUILD_VERSION - The comma patch level

    #  comma_version_patch - The comma patch level

    #                       (meaningless for odd minor).

    #  comma_INCLUDE_DIRS  - Include directories for comma

    #  comma_LIBRARY_DIRS  - Link directories for comma libraries

    @@ -85,4 +85,3 @@ ENDIF ( comma_FOUND )
  
    IF( NOT comma_FOUND )

      MESSAGE(FATAL_ERROR ${comma_DIR_MESSAGE})

    ENDIF( NOT comma_FOUND )

CMakeFiles/check.c++.standard.cmake

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,7 +1,7 @@
  
        SET( CXX_STANDARDS "0x;11;14;17" CACHE STRING "list of known c++ standards" )

        SET( CXX_STANDARDS "0x;11;14;17;20" CACHE STRING "list of known c++ standards" )

        MARK_AS_ADVANCED( FORCE CXX_STANDARDS )

        STRING( REGEX REPLACE ";" "," CXX_STANDARDS_READABLE "${CXX_STANDARDS}" )

        SET( CXX_STANDARD_DEFAULT "11" CACHE STRING "default c++ standard to use" )

        SET( CXX_STANDARD_DEFAULT "17" CACHE STRING "default c++ standard to use" )

        MARK_AS_ADVANCED( FORCE CXX_STANDARD_DEFAULT )

        SET( CXX_STANDARD_TO_USE "${CXX_STANDARD_DEFAULT}" CACHE STRING "c++ standard to use (one of ${CXX_STANDARDS_READABLE})" )

        SET_PROPERTY( CACHE CXX_STANDARD_TO_USE PROPERTY STRINGS ${CXX_STANDARDS} )

    @@ -17,7 +17,6 @@
  
    	 MARK_AS_ADVANCED( FORCE CXX_STANDARD_FLAGS )

        ENDIF()

        # A much better way to do this is with CXX_STANDARD but that requires CMake 3.1

        include( CheckCXXCompilerFlag )

        IF( ${CXX_STANDARD_TO_USE} MATCHES "0x" )

            message( WARNING "

    @@ -28,27 +27,22 @@
  
     #########################################################################

    " )

        ENDIF()

        FOREACH( STANDARD ${CXX_STANDARDS} )

            # message( "Check if using C++${STANDARD}" )

            IF( ${CXX_STANDARD_TO_USE} MATCHES "${STANDARD}" )

                # message( "Yes, using C++${STANDARD}" )

                IF( NOT ( ${CXX_STANDARD_TO_USE} MATCHES ${CXX_STANDARD_LAST} ) )

                    # message( "Have to check if ${CMAKE_CXX_COMPILER} supports C++${STANDARD}" )

                    message( "Attempt to use C++ standard ${STANDARD}" )

    		UNSET( compiler_supports_standard CACHE )

    		UNSET( compiler_flag_to_check CACHE )

    		SET( compiler_flag_to_check "-std=c++${STANDARD}" )

    		if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND ${STANDARD} MATCHES "11" )

    		    set( compiler_flag_to_check "${compiler_flag_to_check} -Wc++11-narrowing" )

    		endif()

    		CHECK_CXX_COMPILER_FLAG( "${compiler_flag_to_check}" compiler_supports_standard )

    		if( NOT compiler_supports_standard )

    		    message( FATAL_ERROR "attempt to use C++ standard ${STANDARD} but ${CMAKE_CXX_COMPILER} does not support it" )

    		endif()

                    STRING( REPLACE " ${CXX_STANDARD_FLAGS}" "" CXX_FLAGS_NO_STANDARD "${CMAKE_CXX_FLAGS}" )

    		SET( CXX_STANDARD_FLAGS ${compiler_flag_to_check} CACHE STRING "updating compiler flags selecting C++ standard" FORCE )

    		SET( CXX_STANDARD_LAST ${CXX_STANDARD_TO_USE} CACHE STRING "updating C++ standard to use option" FORCE )

                    set( CMAKE_CXX_FLAGS "${CXX_FLAGS_NO_STANDARD} ${compiler_flag_to_check}" CACHE STRING "" FORCE )

                ENDIF()

            ENDIF()

        ENDFOREACH()

        IF( NOT ( ${CXX_STANDARD_TO_USE} MATCHES ${CXX_STANDARD_LAST} ) )

            # message( "Have to check if ${CMAKE_CXX_COMPILER} supports C++${CXX_STANDARD_TO_USE}" )

            message( "Attempt to use C++ standard ${CXX_STANDARD_TO_USE}" )

            UNSET( compiler_supports_standard CACHE )

            UNSET( compiler_flag_to_check CACHE )

            SET( compiler_flag_to_check "-std=c++${CXX_STANDARD_TO_USE}" )

            if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND ${CXX_STANDARD_TO_USE} MATCHES "11" )

                set( extra_compiler_flags "${compiler_flag_to_check} -Wc++11-narrowing" )

            endif()

            CHECK_CXX_COMPILER_FLAG( "${compiler_flag_to_check} ${extra_compiler_flags}" compiler_supports_standard )

            if( NOT compiler_supports_standard )

                message( FATAL_ERROR "attempt to use C++ standard ${CXX_STANDARD_TO_USE} but ${CMAKE_CXX_COMPILER} does not support it" )

            endif()

            SET( CXX_STANDARD_LAST ${CXX_STANDARD_TO_USE} CACHE STRING "updating C++ standard to use option" FORCE )

            set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${extra_compiler_flags}" CACHE STRING "" FORCE )

        ENDIF()

        set( CMAKE_CXX_STANDARD ${CXX_STANDARD_TO_USE} )

CMakeFiles/comma-config.cmake.in

-Original file line number
+Diff line change
@@ Expand Up @@
     SET(comma_REQUIRED_SHARED_LINKER_FLAGS "@comma_REQUIRED_SHARED_LINKER_FLAGS@")
     SET(comma_REQUIRED_MODULE_LINKER_FLAGS "@comma_REQUIRED_MODULE_LINKER_FLAGS@")
-    SET(comma_MAJOR_VERSION "@comma_MAJOR_VERSION@")
-    SET(comma_MINOR_VERSION "@comma_MINOR_VERSION@")
-    SET(comma_BUILD_VERSION "@comma_BUILD_VERSION@")
+    SET(comma_version_major "@comma_version_major@")
+    SET(comma_version_minor "@comma_version_minor@")
+    SET(comma_version_patch "@comma_version_patch@")
+    SET(comma_MAJOR_VERSION "@comma_version_major@") # quick and dirty, otherwise comma so library version in dependent packages seem to get messed up
+    SET(comma_MINOR_VERSION "@comma_version_minor@") # quick and dirty, otherwise comma so library version in dependent packages seem to get messed up
+    SET(comma_BUILD_VERSION "@comma_version_patch@") # quick and dirty, otherwise comma so library version in dependent packages seem to get messed up
+    set(comma_version "@comma_version@")
     SET(comma_USE_FILE "@comma_USE_FILE@")
@@ Expand Down @@

CMakeFiles/post_install/CMakeLists.txt

-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    if( BUILD_SHARED_LIBS )
+        install( CODE "message( \"ldconfig: running...\" )" )
+        install( CODE "execute_process( COMMAND /sbin/ldconfig )" )
+        install( CODE "message( \"ldconfig: done\" )" )
+    endif( BUILD_SHARED_LIBS )

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix (some) build errors for new software versions #67

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!

fix (some) build errors for new software versions #67

Are you sure you want to change the base?

Uh oh!

fix (some) build errors for new software versions #67

Uh oh!

Diff view

Diff view

Uh oh!

There are no files selected for viewing

Uh oh!