Skip to content

Commit

Permalink
Fixed non-portable CMake code.
Browse files Browse the repository at this point in the history
  • Loading branch information
DigitalInBlue committed Dec 26, 2022
1 parent 6712f5b commit 6646a8f
Show file tree
Hide file tree
Showing 17 changed files with 0 additions and 18 deletions.
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -205,7 +204,6 @@ else()
endif()

CeleroSetDefaultCompilerOptions()
target_compile_options(${PROJECT_NAME} PRIVATE /wd4251)

target_link_libraries(${PROJECT_NAME} ${SYSLIBS})

Expand Down
1 change: 0 additions & 1 deletion experiments/DemoFileWrite/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion experiments/DemoMultithread/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion experiments/DemoSimple/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion experiments/DemoSimpleJUnit/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion experiments/DemoSleep/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion experiments/DemoToString/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion experiments/DemoTransform/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion experiments/ExperimentCompressBools/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion experiments/ExperimentCostDoNotOptimizeAway/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion experiments/ExperimentCostOfPimpl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion experiments/ExperimentCostSharedPtr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion experiments/ExperimentParameterPassing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion experiments/ExperimentParticles/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion experiments/ExperimentSimpleComparison/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion experiments/ExperimentSortingRandomInts/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down
1 change: 0 additions & 1 deletion experiments/ExperimentSortingRandomIntsUDM/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down

0 comments on commit 6646a8f

Please sign in to comment.