From 329904a055ff68899698beca938e7828fcdf57b2 Mon Sep 17 00:00:00 2001 From: liukaiwen Date: Wed, 27 Sep 2023 18:17:14 +0800 Subject: [PATCH] [cmake] some definitions do not matter build now --- src/Mod/Draft/App/CMakeLists.txt | 4 +--- src/Mod/Drawing/App/CMakeLists.txt | 6 ------ src/Mod/Drawing/Gui/CMakeLists.txt | 6 ------ src/Mod/Fem/App/CMakeLists.txt | 6 ------ src/Mod/Fem/Gui/CMakeLists.txt | 6 ------ src/Mod/Import/App/CMakeLists.txt | 7 ------- src/Mod/Import/Gui/CMakeLists.txt | 7 ------- src/Mod/Inspection/App/CMakeLists.txt | 6 ------ src/Mod/JtReader/App/CMakeLists.txt | 7 ------- src/Mod/Measure/App/CMakeLists.txt | 6 ------ src/Mod/MeshPart/App/CMakeLists.txt | 6 ------ src/Mod/MeshPart/Gui/CMakeLists.txt | 6 ------ src/Mod/Part/App/CMakeLists.txt | 6 ------ src/Mod/Part/Gui/CMakeLists.txt | 6 ------ src/Mod/PartDesign/App/CMakeLists.txt | 6 ------ src/Mod/PartDesign/Gui/CMakeLists.txt | 6 ------ src/Mod/Path/App/CMakeLists.txt | 11 +++-------- src/Mod/Path/Gui/CMakeLists.txt | 6 ------ src/Mod/ReverseEngineering/App/CMakeLists.txt | 6 ------ src/Mod/ReverseEngineering/Gui/CMakeLists.txt | 6 ------ src/Mod/Robot/App/CMakeLists.txt | 7 ------- src/Mod/Robot/Gui/CMakeLists.txt | 8 -------- src/Mod/Sandbox/Gui/CMakeLists.txt | 6 ------ src/Mod/Sketcher/App/CMakeLists.txt | 6 ------ src/Mod/Sketcher/Gui/CMakeLists.txt | 6 ------ src/Mod/Surface/App/CMakeLists.txt | 6 ------ src/Mod/Surface/Gui/CMakeLists.txt | 6 ------ src/Mod/TechDraw/App/CMakeLists.txt | 6 ------ src/Mod/TechDraw/Gui/CMakeLists.txt | 3 --- 29 files changed, 4 insertions(+), 176 deletions(-) diff --git a/src/Mod/Draft/App/CMakeLists.txt b/src/Mod/Draft/App/CMakeLists.txt index bbb414da7b..b9c902f5ac 100644 --- a/src/Mod/Draft/App/CMakeLists.txt +++ b/src/Mod/Draft/App/CMakeLists.txt @@ -1,7 +1,5 @@ if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH -D_CRT_SECURE_NO_WARNINGS) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) endif(MSVC) diff --git a/src/Mod/Drawing/App/CMakeLists.txt b/src/Mod/Drawing/App/CMakeLists.txt index 4698a00fa6..4c5a2aef13 100644 --- a/src/Mod/Drawing/App/CMakeLists.txt +++ b/src/Mod/Drawing/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppDrawing -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H -DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${Boost_INCLUDE_DIRS} diff --git a/src/Mod/Drawing/Gui/CMakeLists.txt b/src/Mod/Drawing/Gui/CMakeLists.txt index 5a253143da..edbf3465f5 100644 --- a/src/Mod/Drawing/Gui/CMakeLists.txt +++ b/src/Mod/Drawing/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ATANH -DHAVE_ASINH -DHAVE_ACOSH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/Fem/App/CMakeLists.txt b/src/Mod/Fem/App/CMakeLists.txt index ea04bbf9c1..cb7c5f5a59 100644 --- a/src/Mod/Fem/App/CMakeLists.txt +++ b/src/Mod/Fem/App/CMakeLists.txt @@ -9,12 +9,6 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) add_compile_options(-Wno-pedantic) # needed for vtk headers endif() -if(MSVC) - add_definitions(-DFCAppFem -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - if(BUILD_FEM_NETGEN) add_definitions(-DFCWithNetgen ${NETGEN_DEFINITIONS}) diff --git a/src/Mod/Fem/Gui/CMakeLists.txt b/src/Mod/Fem/Gui/CMakeLists.txt index 625c85150f..3179deee69 100755 --- a/src/Mod/Fem/Gui/CMakeLists.txt +++ b/src/Mod/Fem/Gui/CMakeLists.txt @@ -9,12 +9,6 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) add_compile_options(-Wno-pedantic) # needed for vtk headers endif() -if(MSVC) - add_definitions(-DFCGuiFem -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - if(BUILD_FEM_NETGEN) add_definitions(-DFCWithNetgen) diff --git a/src/Mod/Import/App/CMakeLists.txt b/src/Mod/Import/App/CMakeLists.txt index ded2ae2886..818416230f 100644 --- a/src/Mod/Import/App/CMakeLists.txt +++ b/src/Mod/Import/App/CMakeLists.txt @@ -1,10 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppImport -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} diff --git a/src/Mod/Import/Gui/CMakeLists.txt b/src/Mod/Import/Gui/CMakeLists.txt index a0fae5a58d..f950c49f2a 100644 --- a/src/Mod/Import/Gui/CMakeLists.txt +++ b/src/Mod/Import/Gui/CMakeLists.txt @@ -1,10 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppPart -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} diff --git a/src/Mod/Inspection/App/CMakeLists.txt b/src/Mod/Inspection/App/CMakeLists.txt index 9790087a51..80b4e7ed22 100644 --- a/src/Mod/Inspection/App/CMakeLists.txt +++ b/src/Mod/Inspection/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} diff --git a/src/Mod/JtReader/App/CMakeLists.txt b/src/Mod/JtReader/App/CMakeLists.txt index 7b8d9c390b..5286ef896c 100644 --- a/src/Mod/JtReader/App/CMakeLists.txt +++ b/src/Mod/JtReader/App/CMakeLists.txt @@ -1,10 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppImport -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} diff --git a/src/Mod/Measure/App/CMakeLists.txt b/src/Mod/Measure/App/CMakeLists.txt index 349d8e2581..2c22cad1b4 100644 --- a/src/Mod/Measure/App/CMakeLists.txt +++ b/src/Mod/Measure/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppMeasure -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H -DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/src diff --git a/src/Mod/MeshPart/App/CMakeLists.txt b/src/Mod/MeshPart/App/CMakeLists.txt index 6ee9deb4eb..32c62ef6fe 100644 --- a/src/Mod/MeshPart/App/CMakeLists.txt +++ b/src/Mod/MeshPart/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppMeshPart -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - if (BUILD_SMESH) add_definitions(-DHAVE_SMESH -DHAVE_MEFISTO) endif(BUILD_SMESH) diff --git a/src/Mod/MeshPart/Gui/CMakeLists.txt b/src/Mod/MeshPart/Gui/CMakeLists.txt index 56f9ee26af..fa5f7a4928 100644 --- a/src/Mod/MeshPart/Gui/CMakeLists.txt +++ b/src/Mod/MeshPart/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - if (BUILD_SMESH) add_definitions(-DHAVE_SMESH -DHAVE_MEFISTO) endif(BUILD_SMESH) diff --git a/src/Mod/Part/App/CMakeLists.txt b/src/Mod/Part/App/CMakeLists.txt index 874ab6ccb0..5b8721764b 100644 --- a/src/Mod/Part/App/CMakeLists.txt +++ b/src/Mod/Part/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppPart -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - if(FREETYPE_FOUND) add_definitions(-DFCUseFreeType) endif(FREETYPE_FOUND) diff --git a/src/Mod/Part/Gui/CMakeLists.txt b/src/Mod/Part/Gui/CMakeLists.txt index 75c3206929..b7876e68fb 100644 --- a/src/Mod/Part/Gui/CMakeLists.txt +++ b/src/Mod/Part/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/PartDesign/App/CMakeLists.txt b/src/Mod/PartDesign/App/CMakeLists.txt index d8db758576..a2ecf82a5a 100644 --- a/src/Mod/PartDesign/App/CMakeLists.txt +++ b/src/Mod/PartDesign/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppPartDesign -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/PartDesign/Gui/CMakeLists.txt b/src/Mod/PartDesign/Gui/CMakeLists.txt index d80be20bda..009fd1a327 100644 --- a/src/Mod/PartDesign/Gui/CMakeLists.txt +++ b/src/Mod/PartDesign/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/Path/App/CMakeLists.txt b/src/Mod/Path/App/CMakeLists.txt index 3f26698405..e26fbab6a6 100644 --- a/src/Mod/Path/App/CMakeLists.txt +++ b/src/Mod/Path/App/CMakeLists.txt @@ -1,11 +1,6 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) - if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") - add_definitions(-fext-numeric-literals) #fix for gcc and qt5 - endif() -endif(MSVC) +if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + add_definitions(-fext-numeric-literals) #fix for gcc and qt5 +endif() include_directories( ${CMAKE_BINARY_DIR} diff --git a/src/Mod/Path/Gui/CMakeLists.txt b/src/Mod/Path/Gui/CMakeLists.txt index b1ba882729..113722c393 100644 --- a/src/Mod/Path/Gui/CMakeLists.txt +++ b/src/Mod/Path/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DFCGuiPath -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/ReverseEngineering/App/CMakeLists.txt b/src/Mod/ReverseEngineering/App/CMakeLists.txt index 13e5360eae..483e934e92 100644 --- a/src/Mod/ReverseEngineering/App/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - if (PCL_SURFACE_FOUND AND PCL_FEATURES_FOUND) add_definitions(-DHAVE_PCL_SURFACE) diff --git a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt index 145fc94c1c..2bf3d465a0 100644 --- a/src/Mod/ReverseEngineering/Gui/CMakeLists.txt +++ b/src/Mod/ReverseEngineering/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/Robot/App/CMakeLists.txt b/src/Mod/Robot/App/CMakeLists.txt index c6a17d7158..ab314f7ff3 100644 --- a/src/Mod/Robot/App/CMakeLists.txt +++ b/src/Mod/Robot/App/CMakeLists.txt @@ -1,10 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppRobot -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/Robot/Gui/CMakeLists.txt b/src/Mod/Robot/Gui/CMakeLists.txt index 589f0d8693..90dab20ac1 100644 --- a/src/Mod/Robot/Gui/CMakeLists.txt +++ b/src/Mod/Robot/Gui/CMakeLists.txt @@ -1,11 +1,3 @@ -if(MSVC) - add_definitions(-DFCGuiRobot -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - - - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/Sandbox/Gui/CMakeLists.txt b/src/Mod/Sandbox/Gui/CMakeLists.txt index 4476da5eaf..94c1956faa 100644 --- a/src/Mod/Sandbox/Gui/CMakeLists.txt +++ b/src/Mod/Sandbox/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_PART -DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_PART -DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src/Gui diff --git a/src/Mod/Sketcher/App/CMakeLists.txt b/src/Mod/Sketcher/App/CMakeLists.txt index d6a600bd4b..f3ee9500af 100644 --- a/src/Mod/Sketcher/App/CMakeLists.txt +++ b/src/Mod/Sketcher/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppSketcher -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - # Uncomment this code if you want to try Eigen's multithread #find_package(OpenMP) #if (OPENMP_FOUND) diff --git a/src/Mod/Sketcher/Gui/CMakeLists.txt b/src/Mod/Sketcher/Gui/CMakeLists.txt index 08772bda5a..d824371974 100644 --- a/src/Mod/Sketcher/Gui/CMakeLists.txt +++ b/src/Mod/Sketcher/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/Surface/App/CMakeLists.txt b/src/Mod/Surface/App/CMakeLists.txt index 0fb3e53a95..1e4dd865ee 100644 --- a/src/Mod/Surface/App/CMakeLists.txt +++ b/src/Mod/Surface/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/src diff --git a/src/Mod/Surface/Gui/CMakeLists.txt b/src/Mod/Surface/Gui/CMakeLists.txt index 977c839d6b..2029c157ce 100644 --- a/src/Mod/Surface/Gui/CMakeLists.txt +++ b/src/Mod/Surface/Gui/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src diff --git a/src/Mod/TechDraw/App/CMakeLists.txt b/src/Mod/TechDraw/App/CMakeLists.txt index 5a25753435..fd3d66475e 100644 --- a/src/Mod/TechDraw/App/CMakeLists.txt +++ b/src/Mod/TechDraw/App/CMakeLists.txt @@ -1,9 +1,3 @@ -if(MSVC) - add_definitions(-DFCAppTechDraw -DHAVE_ACOSH -DHAVE_ASINH -DHAVE_ATANH) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H -DHAVE_ACOSH -DHAVE_ATANH -DHAVE_ASINH) -endif(MSVC) - include_directories( ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}/src diff --git a/src/Mod/TechDraw/Gui/CMakeLists.txt b/src/Mod/TechDraw/Gui/CMakeLists.txt index 8329fa4690..2028ad43e3 100644 --- a/src/Mod/TechDraw/Gui/CMakeLists.txt +++ b/src/Mod/TechDraw/Gui/CMakeLists.txt @@ -1,8 +1,5 @@ if(MSVC) - add_definitions(-DHAVE_ATANH -DHAVE_ASINH -DHAVE_ACOSH) add_compile_options(/utf-8) -else(MSVC) - add_definitions(-DHAVE_LIMITS_H -DHAVE_CONFIG_H) endif(MSVC) # In previous versions this target copied mtextedit.h to the binary directory that causes