removed MSVC guards for importing math symbols

robotology · Dec 18, 2015 · 4ad8ec1 · 4ad8ec1
1 parent 1966fb3
commit 4ad8ec1
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 42 deletions.
diff --git a/src/libraries/ctrlLib/CMakeLists.txt b/src/libraries/ctrlLib/CMakeLists.txt
@@ -35,10 +35,8 @@ include_directories(${PROJECT_SOURCE_DIR}/include
                     ${GSL_INCLUDE_DIRS}
                     ${YARP_INCLUDE_DIRS})
 
-if(MSVC)
-  add_definitions(-D_USE_MATH_DEFINES)
-endif()
-
+# import math symbols from standard cmath
+add_definitions(-D_USE_MATH_DEFINES)
 add_library(${PROJECT_NAME} ${folder_source} ${folder_header})
 target_link_libraries(${PROJECT_NAME} ${GSL_LIBRARIES} ${YARP_LIBRARIES})
 

diff --git a/src/libraries/iDyn/CMakeLists.txt b/src/libraries/iDyn/CMakeLists.txt
@@ -25,10 +25,8 @@ include_directories(${PROJECT_SOURCE_DIR}/include
                     ${GSL_INCLUDE_DIRS}
                     ${YARP_INCLUDE_DIRS})
 
-if(MSVC)
-  add_definitions(-D_USE_MATH_DEFINES)
-endif()
-
+# import math symbols from standard cmath
+add_definitions(-D_USE_MATH_DEFINES)
 add_library(${PROJECT_NAME} ${folder_source} ${folder_header})
 target_link_libraries(${PROJECT_NAME} iKin
                                       skinDynLib

diff --git a/src/libraries/iKin/CMakeLists.txt b/src/libraries/iKin/CMakeLists.txt
@@ -35,10 +35,8 @@ if(ICUB_USE_IPOPT)
    add_definitions(${IPOPT_DEFINITIONS})
 endif()
 
-if(MSVC)
-  add_definitions(-D_USE_MATH_DEFINES)
-endif()
-
+# import math symbols from standard cmath
+add_definitions(-D_USE_MATH_DEFINES)
 add_library(${PROJECT_NAME} ${folder_source} ${folder_header})
 target_link_libraries(${PROJECT_NAME} ctrlLib ${YARP_LIBRARIES})
 

diff --git a/src/libraries/optimization/CMakeLists.txt b/src/libraries/optimization/CMakeLists.txt
@@ -23,11 +23,8 @@ include_directories(${PROJECT_SOURCE_DIR}/include
                     ${IPOPT_INCLUDE_DIRS}
                     ${YARP_INCLUDE_DIRS})
 
-add_definitions(${IPOPT_DEFINITIONS})
-if(MSVC)
-  add_definitions(-D_USE_MATH_DEFINES)
-endif()
-
+# import math symbols from standard cmath
+add_definitions(${IPOPT_DEFINITIONS} -D_USE_MATH_DEFINES)
 add_library(${PROJECTNAME} ${folder_source} ${folder_header})
 
 set_property(TARGET ${PROJECTNAME} APPEND_STRING PROPERTY LINK_FLAGS " ${IPOPT_LINK_FLAGS}")

diff --git a/src/modules/camCalibWithPose/CMakeLists.txt b/src/modules/camCalibWithPose/CMakeLists.txt
@@ -25,10 +25,8 @@ include_directories(${PROJECT_SOURCE_DIR}/include
                     ${OpenCV_INCLUDE_DIRS}
                     ${YARP_INCLUDE_DIRS})
 
-if(MSVC)
-  add_definitions(-D_USE_MATH_DEFINES)
-endif()
-
+# import math symbols from standard cmath
+add_definitions(-D_USE_MATH_DEFINES)
 add_executable(${PROJECT_NAME} ${folder_source} ${folder_header})
 target_link_libraries(${PROJECT_NAME} ${OpenCV_LIBRARIES} ${YARP_LIBRARIES})
 install(TARGETS ${PROJECT_NAME} DESTINATION bin)

diff --git a/src/modules/iKinGazeCtrl/CMakeLists.txt b/src/modules/iKinGazeCtrl/CMakeLists.txt
@@ -28,10 +28,8 @@ include_directories(${PROJECT_SOURCE_DIR}/include
                     ${IPOPT_INCLUDE_DIRS}
                     ${YARP_INCLUDE_DIRS})
 
-if(MSVC)
-  add_definitions(-D_USE_MATH_DEFINES)
-endif()
-
+# import math symbols from standard cmath
+add_definitions(-D_USE_MATH_DEFINES)
 add_executable(${PROJECTNAME} ${folder_header} ${folder_source})
 target_link_libraries(${PROJECTNAME} ctrlLib iKin ${YARP_LIBRARIES})
 install(TARGETS ${PROJECTNAME} DESTINATION bin)

diff --git a/src/modules/wholeBodyDynamics/CMakeLists.txt b/src/modules/wholeBodyDynamics/CMakeLists.txt
@@ -15,10 +15,8 @@ include_directories(${iDyn_INCLUDE_DIRS}
                     ${YARP_INCLUDE_DIRS}
                     ${skinDynLib_INCLUDE_DIRS})
 
-if(MSVC)
-  add_definitions(-D_USE_MATH_DEFINES)
-endif()
-
+# import math symbols from standard cmath
+add_definitions(-D_USE_MATH_DEFINES)
 add_executable(${PROJECT_NAME} ${folder_source} ${folder_header})
 target_link_libraries(${PROJECT_NAME} iDyn
                                       ${YARP_LIBRARIES}

diff --git a/src/simulators/iCubSimulation/CMakeLists.txt b/src/simulators/iCubSimulation/CMakeLists.txt
@@ -87,10 +87,8 @@ ELSE ()
    ADD_DEFINITIONS(-DOMIT_LOGPOLAR)
 ENDIF ()
 
-if(MSVC)
-  add_definitions(-D_USE_MATH_DEFINES)
-endif()
-
+# import math symbols from standard cmath
+add_definitions(-D_USE_MATH_DEFINES)
 ADD_EXECUTABLE(${PROJECTNAME} ${folder_source} ${folder_header})
 
 TARGET_LINK_LIBRARIES(${PROJECTNAME} ${YARP_LIBRARIES} iKin)

diff --git a/src/tools/depth2kin/CMakeLists.txt b/src/tools/depth2kin/CMakeLists.txt
@@ -33,12 +33,9 @@ include_directories(${PROJECT_SOURCE_DIR}/include
                     ${iKin_INCLUDE_DIRS}
                     ${optimization_INCLUDE_DIRS}
                     ${learningMachine_INCLUDE_DIRS})
-
-add_definitions(${IPOPT_DEFINITIONS})
-if(MSVC)
-  add_definitions(-D_USE_MATH_DEFINES)
-endif()
 
+# import math symbols from standard cmath
+add_definitions(${IPOPT_DEFINITIONS} -D_USE_MATH_DEFINES)
 add_executable(${PROJECTNAME} ${header_files} ${source_files} ${idl_files} ${doc_files})
 set_property(TARGET ${PROJECTNAME} APPEND_STRING PROPERTY LINK_FLAGS " ${IPOPT_LINK_FLAGS}")
 target_link_libraries(${PROJECTNAME} ${YARP_LIBRARIES}

diff --git a/src/tools/iCubGui/src/CMakeLists.txt b/src/tools/iCubGui/src/CMakeLists.txt
@@ -62,10 +62,8 @@ include_directories(${GLUT_INCLUDE_DIRS}
 set(CMAKE_INCLUDE_CURRENT_DIR TRUE)
 
 # Set defines
-add_definitions(${QT_DEFINITIONS})
-if(MSVC)
-  add_definitions(-D_USE_MATH_DEFINES)
-endif()
+# import math symbols from standard cmath
+add_definitions(${QT_DEFINITIONS} -D_USE_MATH_DEFINES)
 
 # Compile and link
 add_executable(iCubGui WIN32 ${iCubGui_HDRS}