From: bruneton Date: Wed, 18 Sep 2013 09:51:29 +0000 (+0000) Subject: CMake: windows compilation - added some missing PTHREAD_INCLUDE_DIR X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ba1e14988fbd1bbb2df9ffb515c01784ca0b66db;p=modules%2Fyacs.git CMake: windows compilation - added some missing PTHREAD_INCLUDE_DIR --- diff --git a/src/DSC/DSC_Python/CMakeLists.txt b/src/DSC/DSC_Python/CMakeLists.txt index b4e878048..705af1e00 100755 --- a/src/DSC/DSC_Python/CMakeLists.txt +++ b/src/DSC/DSC_Python/CMakeLists.txt @@ -27,6 +27,7 @@ ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${BOOST_DEFINITIONS} ${PYTHON_DEFINITIONS INCLUDE_DIRECTORIES( ${OMNIORB_INCLUDE_DIR} ${PYTHON_INCLUDE_DIRS} + ${PTHREAD_INCLUDE_DIR} ${Boost_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/salome_adm ${PROJECT_SOURCE_DIR}/src/DSC/DSC_User diff --git a/src/DSC/DSC_User/CMakeLists.txt b/src/DSC/DSC_User/CMakeLists.txt index 460f4d2b0..c4cfc0be6 100755 --- a/src/DSC/DSC_User/CMakeLists.txt +++ b/src/DSC/DSC_User/CMakeLists.txt @@ -17,12 +17,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -ADD_SUBDIRECTORY(Basic) -ADD_SUBDIRECTORY(Datastream) - INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} ${OMNIORB_INCLUDE_DIR} + ${PTHREAD_INCLUDE_DIR} ${PROJECT_BINARY_DIR}/salome_adm ${PROJECT_SOURCE_DIR}/src/Container ${PROJECT_SOURCE_DIR}/src/GenericObj @@ -34,6 +32,9 @@ INCLUDE_DIRECTORIES( ${PROJECT_BINARY_DIR}/idl ) +ADD_SUBDIRECTORY(Basic) +ADD_SUBDIRECTORY(Datastream) + ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${BOOST_DEFINITIONS}) SET(SalomeDSCSuperv_SOURCES diff --git a/src/DSC/DSC_User/Datastream/CMakeLists.txt b/src/DSC/DSC_User/Datastream/CMakeLists.txt index 030111b36..93ed00860 100755 --- a/src/DSC/DSC_User/Datastream/CMakeLists.txt +++ b/src/DSC/DSC_User/Datastream/CMakeLists.txt @@ -17,9 +17,6 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -ADD_SUBDIRECTORY(Palm) -ADD_SUBDIRECTORY(Calcium) - INCLUDE_DIRECTORIES( ${Boost_INCLUDE_DIRS} ${PROJECT_BINARY_DIR}/salome_adm @@ -29,6 +26,9 @@ INCLUDE_DIRECTORIES( ${CMAKE_CURRENT_SOURCE_DIR}/.. ) +ADD_SUBDIRECTORY(Palm) +ADD_SUBDIRECTORY(Calcium) + # This local variable defines the list of dependant libraries common to all target in this package. SET(COMMON_LIBS SalomePalm diff --git a/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt b/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt index e641c2ea0..2db0371d0 100755 --- a/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt +++ b/src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt @@ -18,7 +18,6 @@ # INCLUDE_DIRECTORIES( - ${Boost_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIR} ${PROJECT_BINARY_DIR} ${PROJECT_BINARY_DIR}/salome_adm