C++11 Conversion, Refactor and CMake conversion #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

MatthewPowley wants to merge 41 commits into mtconnect:master from MatthewPowley:Cpp11_Conversion

.gitignore

-Original file line number
+Diff line change
@@ Expand Up / @@ -12,3 +12,328 @@ build @@
     *.vcproj
     CMakeFiles
     *.dir
+    ## Ignore Visual Studio temporary files, build results, and
+    ## files generated by popular Visual Studio add-ons.
+    ##
+    ## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore
+    # User-specific files
+    *.suo
+    *.user
+    *.userosscache
+    *.sln.docstates
+    # User-specific files (MonoDevelop/Xamarin Studio)
+    *.userprefs
+    # Build results
+    [Dd]ebug/
+    [Dd]ebugPublic/
+    [Rr]elease/
+    [Rr]eleases/
+    x64/
+    x86/
+    bld/
+    [Bb]in/
+    [Oo]bj/
+    [Ll]og/
+    # Visual Studio 2015/2017 cache/options directory
+    .vs/
+    # Uncomment if you have tasks that create the project's static files in wwwroot
+    #wwwroot/
+    # Visual Studio 2017 auto generated files
+    Generated\ Files/
+    # MSTest test Results
+    [Tt]est[Rr]esult*/
+    [Bb]uild[Ll]og.*
+    # NUNIT
+    *.VisualState.xml
+    TestResult.xml
+    # Build Results of an ATL Project
+    [Dd]ebugPS/
+    [Rr]eleasePS/
+    dlldata.c
+    # Benchmark Results
+    BenchmarkDotNet.Artifacts/
+    # .NET Core
+    project.lock.json
+    project.fragment.lock.json
+    artifacts/
+    **/Properties/launchSettings.json
+    # StyleCop
+    StyleCopReport.xml
+    # Files built by Visual Studio
+    *_i.c
+    *_p.c
+    *_i.h
+    *.ilk
+    *.meta
+    *.obj
+    *.pch
+    *.pdb
+    *.pgc
+    *.pgd
+    *.rsp
+    *.sbr
+    *.tlb
+    *.tli
+    *.tlh
+    *.tmp
+    *.tmp_proj
+    *.log
+    *.vspscc
+    *.vssscc
+    .builds
+    *.pidb
+    *.svclog
+    *.scc
+    # Chutzpah Test files
+    _Chutzpah*
+    # Visual C++ cache files
+    ipch/
+    *.aps
+    *.ncb
+    *.opendb
+    *.opensdf
+    *.sdf
+    *.cachefile
+    *.VC.db
+    *.VC.VC.opendb
+    # Visual Studio profiler
+    *.psess
+    *.vsp
+    *.vspx
+    *.sap
+    # Visual Studio Trace Files
+    *.e2e
+    # TFS 2012 Local Workspace
+    $tf/
+    # Guidance Automation Toolkit
+    *.gpState
+    # ReSharper is a .NET coding add-in
+    _ReSharper*/
+    *.[Rr]e[Ss]harper
+    *.DotSettings.user
+    # JustCode is a .NET coding add-in
+    .JustCode
+    # TeamCity is a build add-in
+    _TeamCity*
+    # DotCover is a Code Coverage Tool
+    *.dotCover
+    # AxoCover is a Code Coverage Tool
+    .axoCover/*
+    !.axoCover/settings.json
+    # Visual Studio code coverage results
+    *.coverage
+    *.coveragexml
+    # NCrunch
+    _NCrunch_*
+    .*crunch*.local.xml
+    nCrunchTemp_*
+    # MightyMoose
+    *.mm.*
+    AutoTest.Net/
+    # Web workbench (sass)
+    .sass-cache/
+    # Installshield output folder
+    [Ee]xpress/
+    # DocProject is a documentation generator add-in
+    DocProject/buildhelp/
+    DocProject/Help/*.HxT
+    DocProject/Help/*.HxC
+    DocProject/Help/*.hhc
+    DocProject/Help/*.hhk
+    DocProject/Help/*.hhp
+    DocProject/Help/Html2
+    DocProject/Help/html
+    # Click-Once directory
+    publish/
+    # Publish Web Output
+    *.[Pp]ublish.xml
+    *.azurePubxml
+    # Note: Comment the next line if you want to checkin your web deploy settings,
+    # but database connection strings (with potential passwords) will be unencrypted
+    *.pubxml
+    *.publishproj
+    # Microsoft Azure Web App publish settings. Comment the next line if you want to
+    # checkin your Azure Web App publish settings, but sensitive information contained
+    # in these scripts will be unencrypted
+    PublishScripts/
+    # NuGet Packages
+    *.nupkg
+    # The packages folder can be ignored because of Package Restore
+    **/[Pp]ackages/*
+    # except build/, which is used as an MSBuild target.
+    !**/[Pp]ackages/build/
+    # Uncomment if necessary however generally it will be regenerated when needed
+    #!**/[Pp]ackages/repositories.config
+    # NuGet v3's project.json files produces more ignorable files
+    *.nuget.props
+    *.nuget.targets
+    # Microsoft Azure Build Output
+    csx/
+    *.build.csdef
+    # Microsoft Azure Emulator
+    ecf/
+    rcf/
+    # Windows Store app package directories and files
+    AppPackages/
+    BundleArtifacts/
+    Package.StoreAssociation.xml
+    _pkginfo.txt
+    *.appx
+    # Visual Studio cache files
+    # files ending in .cache can be ignored
+    *.[Cc]ache
+    # but keep track of directories ending in .cache
+    !*.[Cc]ache/
+    # Others
+    ClientBin/
+    ~$*
+    *~
+    *.dbmdl
+    *.dbproj.schemaview
+    *.jfm
+    *.pfx
+    *.publishsettings
+    orleans.codegen.cs
+    # Including strong name files can present a security risk
+    # (https://github.com/github/gitignore/pull/2483#issue-259490424)
+    #*.snk
+    # Since there are multiple workflows, uncomment next line to ignore bower_components
+    # (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
+    #bower_components/
+    # RIA/Silverlight projects
+    Generated_Code/
+    # Backup & report files from converting an old project file
+    # to a newer Visual Studio version. Backup files are not needed,
+    # because we have git ;-)
+    _UpgradeReport_Files/
+    Backup*/
+    UpgradeLog*.XML
+    UpgradeLog*.htm
+    ServiceFabricBackup/
+    # SQL Server files
+    *.mdf
+    *.ldf
+    *.ndf
+    # Business Intelligence projects
+    *.rdl.data
+    *.bim.layout
+    *.bim_*.settings
+    *.rptproj.rsuser
+    # Microsoft Fakes
+    FakesAssemblies/
+    # GhostDoc plugin setting file
+    *.GhostDoc.xml
+    # Node.js Tools for Visual Studio
+    .ntvs_analysis.dat
+    node_modules/
+    # Visual Studio 6 build log
+    *.plg
+    # Visual Studio 6 workspace options file
+    *.opt
+    # Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
+    *.vbw
+    # Visual Studio LightSwitch build output
+    **/*.HTMLClient/GeneratedArtifacts
+    **/*.DesktopClient/GeneratedArtifacts
+    **/*.DesktopClient/ModelManifest.xml
+    **/*.Server/GeneratedArtifacts
+    **/*.Server/ModelManifest.xml
+    _Pvt_Extensions
+    # Paket dependency manager
+    .paket/paket.exe
+    paket-files/
+    # FAKE - F# Make
+    .fake/
+    # JetBrains Rider
+    .idea/
+    *.sln.iml
+    # CodeRush
+    .cr/
+    # Python Tools for Visual Studio (PTVS)
+    __pycache__/
+    *.pyc
+    # Cake - Uncomment if you are using it
+    # tools/**
+    # !tools/packages.config
+    # Tabs Studio
+    *.tss
+    # Telerik's JustMock configuration file
+    *.jmconfig
+    # BizTalk build output
+    *.btp.cs
+    *.btm.cs
+    *.odx.cs
+    *.xsd.cs
+    # OpenCover UI analysis results
+    OpenCover/
+    # Azure Stream Analytics local run output
+    ASALocalRun/
+    # MSBuild Binary and Structured Log
+    *.binlog
+    # NVidia Nsight GPU debugger configuration file
+    *.nvuser

.gitmodules

-Original file line number
+Diff line change
@@ -0,0 +1,6 @@
+    [submodule "cppunit"]
+    	path = cppunit
+    	url = https://anongit.freedesktop.org/git/libreoffice/cppunit
+    [submodule "date"]
+    	path = date
+    	url = https://github.com/HowardHinnant/date.git

CMakeLists.txt

-Original file line number
+Diff line change
@@ -0,0 +1,41 @@
+    cmake_minimum_required(VERSION 3.7 FATAL_ERROR) #This minimum version is to support Visual Studio 2017 and C++ feature checking
+    project(adapters)
+    # All of the C++ code and CppUnit require C++ 11 features to compile.
+    # We will define these properties by default for each CMake target to be created.
+    set_property(GLOBAL PROPERTY CXX_STANDARD 11)
+    set_property(GLOBAL PROPERTY CXX_STANDARD_REQUIRED ON)
+    # By default only generate 2 configurations (Debug and Release) for simplicity.
+    # The user can change this option if required for the additional ones such as 'RelWithDebInfo'.
+    set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE)
+    if(DEFINED CMAKE_BUILD_TYPE)
+      set_property( CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES} )
+    endif()
+    # Add our './cmake' sub-folder to the lists searched when calling functions
+    list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/")
+    # Setup compiler options for Windows, OSX, Linux (each file guards against usage on an inappropriate platform)
+    if(MSVC)
+    	# Default winver to Vista and Later
+    	set(WINVER "0x0600" CACHE STRING "Windows Target Version: 0x0400 - 95 & NT 4.0, 0x0500 - 2000, 0x0501 - XP, 0x0600 - Vista, 0x0601 - 7, 0x0602 - 8")
+    endif()
+    include(cmake/osx_no_app_or_frameworks.cmake)
+    include(cmake/msvc_xp_support.cmake)
+    include(cmake/vs_set_working_directory.cmake)
+    include(cmake/date.cmake)
+    include(cmake/adapter_fanuc.cmake)
+    # Add our dependency projects
+    set(MSVC_SHARED_RT ON) # Use shared runtime libraries for Microsoft compiles
+    include(cmake/CppUnit.cmake)
+    # Add our projects
+    if(${BUILD_FANUC}) # This is conditional as it requires the externally specified FOCAS-2 libraries to be purchased
+    	add_subdirectory(fanuc)
+    endif()
+    add_subdirectory(fake)
+    add_subdirectory(test)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

C++11 Conversion, Refactor and CMake conversion #9

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

C++11 Conversion, Refactor and CMake conversion #9

Are you sure you want to change the base?

Uh oh!

C++11 Conversion, Refactor and CMake conversion #9

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!