Fixed non-portable CMake code.

DigitalInBlue · DigitalInBlue · commit 6646a8f40c02 · 2022-12-26T15:56:31.000-05:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -35,7 +35,6 @@ macro(CeleroSetDefaultCompilerOptions)
 		target_compile_options(${PROJECT_NAME} PRIVATE /D_SCL_SECURE_NO_WARNINGS)
 		target_compile_options(${PROJECT_NAME} PRIVATE /permissive-)
 		target_compile_options(${PROJECT_NAME} PRIVATE /MP)
-		target_compile_definitions(${PROJECT_NAME} PRIVATE /wd4251)
 
 		if (NOT CELERO_COMPILE_DYNAMIC_LIBRARIES)
 			if(VCPKG_CRT_LINKAGE)
@@ -205,7 +204,6 @@ else()
 endif()
 
 CeleroSetDefaultCompilerOptions()
-target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
 
 target_link_libraries(${PROJECT_NAME} ${SYSLIBS})
 
diff --git a/experiments/DemoFileWrite/CMakeLists.txt b/experiments/DemoFileWrite/CMakeLists.txt
@@ -25,7 +25,6 @@ target_sources(${PROJECT_NAME} PRIVATE
 )
 
 CeleroSetDefaultCompilerOptions()
-target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
 
 target_link_libraries(${PROJECT_NAME} celero)
 include_directories(${HEADER_PATH})
diff --git a/experiments/DemoMultithread/CMakeLists.txt b/experiments/DemoMultithread/CMakeLists.txt
@@ -44,7 +44,6 @@ SET(PROJECT_NAME CeleroDemo-Multithread)
     target_link_libraries(${PROJECT_NAME} celero)
 
     CeleroSetDefaultCompilerOptions()
-    target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
 
     # Broiler Plate: Add Celer's include directories.
     include_directories(${HEADER_PATH})
diff --git a/experiments/DemoSimple/CMakeLists.txt b/experiments/DemoSimple/CMakeLists.txt
@@ -41,7 +41,6 @@ add_executable(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME} celero)
     
 CeleroSetDefaultCompilerOptions()
-target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
        
 # Broiler Plate: Add Celer's include directories.
 include_directories(${HEADER_PATH})
diff --git a/experiments/DemoSimpleJUnit/CMakeLists.txt b/experiments/DemoSimpleJUnit/CMakeLists.txt
@@ -44,7 +44,6 @@ add_executable(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME} celero)
     
 CeleroSetDefaultCompilerOptions()
-target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
     
 # Broiler Plate: Add Celer's include directories.
 include_directories(${HEADER_PATH})
diff --git a/experiments/DemoSleep/CMakeLists.txt b/experiments/DemoSleep/CMakeLists.txt
@@ -41,7 +41,6 @@ add_executable(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME} celero)
     
 CeleroSetDefaultCompilerOptions()
-target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
        
 # Broiler Plate: Add Celer's include directories.
 include_directories(${HEADER_PATH})
diff --git a/experiments/DemoToString/CMakeLists.txt b/experiments/DemoToString/CMakeLists.txt
@@ -44,7 +44,6 @@ add_executable(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME} celero)
     
 CeleroSetDefaultCompilerOptions()
-target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
     
 # Broiler Plate: Add Celer's include directories.
 include_directories(${HEADER_PATH})
diff --git a/experiments/DemoTransform/CMakeLists.txt b/experiments/DemoTransform/CMakeLists.txt
@@ -41,7 +41,6 @@ add_executable(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME} celero)
     
 CeleroSetDefaultCompilerOptions()
-target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
        
 # Broiler Plate: Add Celer's include directories.
 include_directories(${HEADER_PATH})
diff --git a/experiments/ExperimentCompressBools/CMakeLists.txt b/experiments/ExperimentCompressBools/CMakeLists.txt
@@ -46,7 +46,6 @@ if(${CMAKE_CXX_COMPILER_ID} STREQUAL MSVC)
     target_link_libraries(${PROJECT_NAME} celero)
     
     CeleroSetDefaultCompilerOptions()
-    target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
         
     # Broiler Plate: Add Celer's include directories.
     include_directories(${HEADER_PATH})
diff --git a/experiments/ExperimentCostDoNotOptimizeAway/CMakeLists.txt b/experiments/ExperimentCostDoNotOptimizeAway/CMakeLists.txt
@@ -44,7 +44,6 @@ add_executable(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME} celero)
     
 CeleroSetDefaultCompilerOptions()
-target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
        
 # Broiler Plate: Add Celer's include directories.
 include_directories(${HEADER_PATH})
diff --git a/experiments/ExperimentCostOfPimpl/CMakeLists.txt b/experiments/ExperimentCostOfPimpl/CMakeLists.txt
@@ -44,7 +44,6 @@ add_executable(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME} celero)
     
 CeleroSetDefaultCompilerOptions()
-target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
     
 # Broiler Plate: Add Celer's include directories.
 include_directories(${HEADER_PATH})
diff --git a/experiments/ExperimentCostSharedPtr/CMakeLists.txt b/experiments/ExperimentCostSharedPtr/CMakeLists.txt
@@ -38,7 +38,6 @@ SET(PROJECT_NAME CeleroExperiment-CostOfSharedPtr)
     target_link_libraries(${PROJECT_NAME} celero)
     
     CeleroSetDefaultCompilerOptions()
-    target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
     
     # Broiler Plate: Add Celer's include directories.
     include_directories(${HEADER_PATH})
diff --git a/experiments/ExperimentParameterPassing/CMakeLists.txt b/experiments/ExperimentParameterPassing/CMakeLists.txt
@@ -44,7 +44,6 @@ add_executable(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME} celero)
     
 CeleroSetDefaultCompilerOptions()
-target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
     
 # Broiler Plate: Add Celer's include directories.
 include_directories(${HEADER_PATH})
diff --git a/experiments/ExperimentParticles/CMakeLists.txt b/experiments/ExperimentParticles/CMakeLists.txt
@@ -45,7 +45,6 @@ SET(PROJECT_NAME CeleroExperiment-Particles)
     target_link_libraries(${PROJECT_NAME} celero)
     
     CeleroSetDefaultCompilerOptions()
-    target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
     
     # Broiler Plate: Add Celer's include directories.
     include_directories(${HEADER_PATH})
diff --git a/experiments/ExperimentSimpleComparison/CMakeLists.txt b/experiments/ExperimentSimpleComparison/CMakeLists.txt
@@ -44,7 +44,6 @@ SET(PROJECT_NAME CeleroExperiment-SimpleComparison)
     target_link_libraries(${PROJECT_NAME} celero)
     
     CeleroSetDefaultCompilerOptions()
-    target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
     
     # Broiler Plate: Add Celer's include directories.
     include_directories(${HEADER_PATH})
diff --git a/experiments/ExperimentSortingRandomInts/CMakeLists.txt b/experiments/ExperimentSortingRandomInts/CMakeLists.txt
@@ -44,7 +44,6 @@ add_executable(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME} celero)
     
 CeleroSetDefaultCompilerOptions()
-target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
     
 # Broiler Plate: Add Celer's include directories.
 include_directories(${HEADER_PATH})
diff --git a/experiments/ExperimentSortingRandomIntsUDM/CMakeLists.txt b/experiments/ExperimentSortingRandomIntsUDM/CMakeLists.txt
@@ -45,7 +45,6 @@ add_executable(${PROJECT_NAME}
 target_link_libraries(${PROJECT_NAME} celero)
     
 CeleroSetDefaultCompilerOptions()
-target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)
     
 # Broiler Plate: Add Celer's include directories.
 include_directories(${HEADER_PATH})

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ target_sources(${PROJECT_NAME} PRIVATE`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`CeleroSetDefaultCompilerOptions()`
`28`		`-target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)`
`29`	`28`
`30`	`29`	`target_link_libraries(${PROJECT_NAME} celero)`
`31`	`30`	`include_directories(${HEADER_PATH})`