From de9c61e150e7bd2659aac4d7f4479648ed03d14c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Tr=C3=B6ger?= Date: Sat, 25 Jan 2014 16:03:05 +0100 Subject: [PATCH] restore externalisation behaviour with gcc/clang compilers --- src/Mod/Assembly/App/CMakeLists.txt | 6 +----- src/Mod/Assembly/CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Mod/Assembly/App/CMakeLists.txt b/src/Mod/Assembly/App/CMakeLists.txt index 2117aa1f1..5300ae8a8 100644 --- a/src/Mod/Assembly/App/CMakeLists.txt +++ b/src/Mod/Assembly/App/CMakeLists.txt @@ -59,7 +59,7 @@ SOURCE_GROUP("Module" FILES ${Module_SRCS}) #externalisation is not possible for msvc as a stupid bug prevents the function definition resolving if(MSVC) set(Solver_SRC ) -elseif(MSVC) +else(MSVC) set(Solver_SRC Solver/solver_3d_ext1.cpp Solver/solver_3d_ext2.cpp Solver/solver_3d_ext3.cpp @@ -71,10 +71,6 @@ elseif(MSVC) Solver/solver_state_ext2.cpp ) endif(FREECAD_ASSEMBLY_DEBUG_FACILITIES) - - add_definitions(-DDCM_EXTERNAL_CORE) - add_definitions(-DDCM_EXTERNAL_3D) - add_definitions(-DDCM_EXTERNAL_STATE) endif(MSVC) SOURCE_GROUP("Solver" FILES ${Solver_SRC}) diff --git a/src/Mod/Assembly/CMakeLists.txt b/src/Mod/Assembly/CMakeLists.txt index fcded4781..7db711b9c 100644 --- a/src/Mod/Assembly/CMakeLists.txt +++ b/src/Mod/Assembly/CMakeLists.txt @@ -10,6 +10,10 @@ endif(FREECAD_ASSEMBLY_DEBUG_FACILITIES) if(MSVC) add_definitions(/wd4503) add_definitions(/wd4181) +else(MSVC) +add_definitions(-DDCM_EXTERNAL_CORE) +add_definitions(-DDCM_EXTERNAL_3D) +add_definitions(-DDCM_EXTERNAL_STATE) endif(MSVC) add_subdirectory(App)