From b935963da3b8cfda9e99386c205e64f76a0729f5 Mon Sep 17 00:00:00 2001 From: mpa Date: Fri, 8 Nov 2013 10:50:09 +0000 Subject: [PATCH] CMake: - delete definition "-DYACS_PTHREAD" in current directory, because this definition has been added in root directory in CMakeLists.txt --- src/engine_swig/CMakeLists.txt | 1 - src/genericgui/CMakeLists.txt | 1 - src/hmi/CMakeLists.txt | 1 - src/runtime_swig/CMakeLists.txt | 1 - src/salomegui/CMakeLists.txt | 1 - src/salomegui_swig/CMakeLists.txt | 1 - 6 files changed, 6 deletions(-) diff --git a/src/engine_swig/CMakeLists.txt b/src/engine_swig/CMakeLists.txt index 4af959f2c..c303ec93c 100644 --- a/src/engine_swig/CMakeLists.txt +++ b/src/engine_swig/CMakeLists.txt @@ -51,7 +51,6 @@ SET_PROPERTY(SOURCE pilot.i pypilot.i PROPERTY ADD_DEFINITIONS( ${PYTHON_DEFINITIONS} ${OMNIORB_DEFINITIONS} - -DYACS_PTHREAD ) IF(WIN32) ADD_DEFINITIONS(-DNOGDI) diff --git a/src/genericgui/CMakeLists.txt b/src/genericgui/CMakeLists.txt index 0d843eb99..1174e762f 100644 --- a/src/genericgui/CMakeLists.txt +++ b/src/genericgui/CMakeLists.txt @@ -46,7 +46,6 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( ${QT_DEFINITIONS} - -DYACS_PTHREAD ${PYTHON_DEFINITIONS} ${GRAPHVIZ_DEFINITIONS} ${OMNIORB_DEFINITIONS} diff --git a/src/hmi/CMakeLists.txt b/src/hmi/CMakeLists.txt index 440cfb2ea..67b813777 100644 --- a/src/hmi/CMakeLists.txt +++ b/src/hmi/CMakeLists.txt @@ -39,7 +39,6 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - -DYACS_PTHREAD ${PYTHON_DEFINITIONS} ${OMNIORB_DEFINITIONS} ) diff --git a/src/runtime_swig/CMakeLists.txt b/src/runtime_swig/CMakeLists.txt index fd96ad4f6..62d4ff254 100644 --- a/src/runtime_swig/CMakeLists.txt +++ b/src/runtime_swig/CMakeLists.txt @@ -55,7 +55,6 @@ SET_PROPERTY(SOURCE SALOMERuntime.i PROPERTY ADD_DEFINITIONS( ${PYTHON_DEFINITIONS} ${OMNIORB_DEFINITIONS} - -DYACS_PTHREAD ) # libraries to link to diff --git a/src/salomegui/CMakeLists.txt b/src/salomegui/CMakeLists.txt index 84840297f..ed8b57e84 100644 --- a/src/salomegui/CMakeLists.txt +++ b/src/salomegui/CMakeLists.txt @@ -45,7 +45,6 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( - -DYACS_PTHREAD ${PYTHON_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${BOOST_DEFINITIONS} diff --git a/src/salomegui_swig/CMakeLists.txt b/src/salomegui_swig/CMakeLists.txt index 7bb5b256e..ac75427be 100644 --- a/src/salomegui_swig/CMakeLists.txt +++ b/src/salomegui_swig/CMakeLists.txt @@ -45,7 +45,6 @@ INCLUDE_DIRECTORIES( # additional preprocessor / compiler flags ADD_DEFINITIONS( ${QT_DEFINITIONS} - -DYACS_PTHREAD ${PYTHON_DEFINITIONS} ${OMNIORB_DEFINITIONS} ${BOOST_DEFINITIONS} -- 2.39.2