Skip to content

Commit

Permalink
Fixing up CMake stuff.
Browse files Browse the repository at this point in the history
  • Loading branch information
@jlconlin
jlconlin committed Jun 30, 2020
1 parent 8574998 commit dacf4c5
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 28 deletions.
51 changes: 25 additions & 26 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,18 +103,6 @@ set( constants_AppleClang_Darwin_link_time_optimization_flags "-flto" )
set( constants_AppleClang_Darwin_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
set( constants_AppleClang_Darwin_nonportable_optimization_flags "-march=native" )
set( constants_AppleClang_Darwin_static_flags "-static" )
set( constants_GNU_Windows_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=c++17" )
set( constants_GNU_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
set( constants_GNU_Windows_RELEASE_flags "-O3" "-DNDEBUG" )
set( constants_GNU_Windows_strict_flags "-Werror" )
set( constants_GNU_Windows_coverage_flags "--coverage" )
set( constants_GNU_Windows_subproject_flags )
set( constants_GNU_Windows_base_project_flags )
set( constants_GNU_Windows_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
set( constants_GNU_Windows_link_time_optimization_flags "-flto" )
set( constants_GNU_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
set( constants_GNU_Windows_nonportable_optimization_flags "-march=native" )
set( constants_GNU_Windows_static_flags "-static" )
set( constants_GNU_CYGWIN_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=gnu++17" )
set( constants_GNU_CYGWIN_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
set( constants_GNU_CYGWIN_RELEASE_flags "-O3" "-DNDEBUG" )
Expand Down Expand Up @@ -151,6 +139,18 @@ set( constants_GNU_MinGW_link_time_optimization_flags "-flto" )
set( constants_GNU_MinGW_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
set( constants_GNU_MinGW_nonportable_optimization_flags "-march=native" )
set( constants_GNU_MinGW_static_flags "-static" )
set( constants_GNU_Windows_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=c++17" )
set( constants_GNU_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
set( constants_GNU_Windows_RELEASE_flags "-O3" "-DNDEBUG" )
set( constants_GNU_Windows_strict_flags "-Werror" )
set( constants_GNU_Windows_coverage_flags "--coverage" )
set( constants_GNU_Windows_subproject_flags )
set( constants_GNU_Windows_base_project_flags )
set( constants_GNU_Windows_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
set( constants_GNU_Windows_link_time_optimization_flags "-flto" )
set( constants_GNU_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
set( constants_GNU_Windows_nonportable_optimization_flags "-march=native" )
set( constants_GNU_Windows_static_flags "-static" )
set( constants_GNU_Darwin_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=c++17" )
set( constants_GNU_Darwin_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
set( constants_GNU_Darwin_RELEASE_flags "-O3" "-DNDEBUG" )
Expand All @@ -163,18 +163,6 @@ set( constants_GNU_Darwin_link_time_optimization_flags "-flto" )
set( constants_GNU_Darwin_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
set( constants_GNU_Darwin_nonportable_optimization_flags "-march=native" )
set( constants_GNU_Darwin_static_flags "-static" )
set( constants_Clang_Windows_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++17" )
set( constants_Clang_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" )
set( constants_Clang_Windows_RELEASE_flags "-O3" "-DNDEBUG" )
set( constants_Clang_Windows_strict_flags "-Werror" )
set( constants_Clang_Windows_coverage_flags "--coverage" )
set( constants_Clang_Windows_subproject_flags )
set( constants_Clang_Windows_base_project_flags )
set( constants_Clang_Windows_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
set( constants_Clang_Windows_link_time_optimization_flags "-flto" )
set( constants_Clang_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
set( constants_Clang_Windows_nonportable_optimization_flags "-march=native" )
set( constants_Clang_Windows_static_flags "-static" )
set( constants_Clang_CYGWIN_common_flags "-Wno-subobject-linkage" "-Wall" "-Wextra" "-Wpedantic" "-std=gnu++17" )
set( constants_Clang_CYGWIN_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
set( constants_Clang_CYGWIN_RELEASE_flags "-O3" "-DNDEBUG" )
Expand Down Expand Up @@ -211,6 +199,18 @@ set( constants_Clang_MinGW_link_time_optimization_flags "-flto" )
set( constants_Clang_MinGW_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
set( constants_Clang_MinGW_nonportable_optimization_flags "-march=native" )
set( constants_Clang_MinGW_static_flags "-static" )
set( constants_Clang_Windows_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++17" )
set( constants_Clang_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" )
set( constants_Clang_Windows_RELEASE_flags "-O3" "-DNDEBUG" )
set( constants_Clang_Windows_strict_flags "-Werror" )
set( constants_Clang_Windows_coverage_flags "--coverage" )
set( constants_Clang_Windows_subproject_flags )
set( constants_Clang_Windows_base_project_flags )
set( constants_Clang_Windows_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
set( constants_Clang_Windows_link_time_optimization_flags "-flto" )
set( constants_Clang_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
set( constants_Clang_Windows_nonportable_optimization_flags "-march=native" )
set( constants_Clang_Windows_static_flags "-static" )
set( constants_Clang_Darwin_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++17" )
set( constants_Clang_Darwin_DEBUG_flags "-O0" "-g" "-gdwarf-3" )
set( constants_Clang_Darwin_RELEASE_flags "-O3" "-DNDEBUG" )
Expand Down Expand Up @@ -292,8 +292,7 @@ target_sources( constants INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/src/constants.h
"${CMAKE_CURRENT_SOURCE_DIR}/src/constants/tags.hpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/constants/CODATA2018.hpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/constants/testing/src/defineReferenceValues.hpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/constants/testing/src/toValue.hpp"
"${CMAKE_CURRENT_SOURCE_DIR}/src/constants/src/addUncertainty.hpp" )
"${CMAKE_CURRENT_SOURCE_DIR}/src/constants/testing/src/toValue.hpp" )

target_include_directories( constants INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/src src/ )

Expand Down
3 changes: 1 addition & 2 deletions metaconfigure/description.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -596,8 +596,7 @@
"src/constants/tags.hpp",
"src/constants/CODATA2018.hpp",
"src/constants/testing/src/defineReferenceValues.hpp",
"src/constants/testing/src/toValue.hpp",
"src/constants/src/addUncertainty.hpp"
"src/constants/testing/src/toValue.hpp"
],
"ignore pattern": "$^",
"implementation files": [],
Expand Down

0 comments on commit dacf4c5

Please sign in to comment.