Salome HOME
projects
/
modules
/
kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
83f6420
)
CMake: windows compilation - added some missing PTHREAD_INCLUDE_DIR
author
bruneton
<bruneton>
Wed, 18 Sep 2013 09:51:29 +0000
(09:51 +0000)
committer
bruneton
<bruneton>
Wed, 18 Sep 2013 09:51:29 +0000
(09:51 +0000)
src/DSC/DSC_Python/CMakeLists.txt
patch
|
blob
|
history
src/DSC/DSC_User/CMakeLists.txt
patch
|
blob
|
history
src/DSC/DSC_User/Datastream/CMakeLists.txt
patch
|
blob
|
history
src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt
patch
|
blob
|
history
diff --git
a/src/DSC/DSC_Python/CMakeLists.txt
b/src/DSC/DSC_Python/CMakeLists.txt
index b4e878048fe9bdf8896bdcdd6a3f665255bcca3a..705af1e0011e08ed31d9d67c28f503add0eb3fe8 100755
(executable)
--- 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}
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
${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 460f4d2b0fe1090e0e0456c787850d8a0bf914ae..c4cfc0be6ace97a5dcc29a49d557034b17bd42de 100755
(executable)
--- 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
#
# 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}
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
${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
)
${PROJECT_BINARY_DIR}/idl
)
+ADD_SUBDIRECTORY(Basic)
+ADD_SUBDIRECTORY(Datastream)
+
ADD_DEFINITIONS(${OMNIORB_DEFINITIONS} ${BOOST_DEFINITIONS})
SET(SalomeDSCSuperv_SOURCES
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 030111b363c48152a92a413d4e00bef3f3c8b498..93ed00860183a8571898cc9e5c0037b525ba6679 100755
(executable)
--- 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
#
# 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
INCLUDE_DIRECTORIES(
${Boost_INCLUDE_DIRS}
${PROJECT_BINARY_DIR}/salome_adm
@@
-29,6
+26,9
@@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/..
)
${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
# 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 e641c2ea0da8cbd8b74b1cee6023361ffa763a2f..2db0371d0b84070a82179256045f7cac9315ebb5 100755
(executable)
--- a/
src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt
+++ b/
src/DSC/DSC_User/Datastream/Calcium/CMakeLists.txt
@@
-18,7
+18,6
@@
#
INCLUDE_DIRECTORIES(
#
INCLUDE_DIRECTORIES(
- ${Boost_INCLUDE_DIR}
${OMNIORB_INCLUDE_DIR}
${PROJECT_BINARY_DIR}
${PROJECT_BINARY_DIR}/salome_adm
${OMNIORB_INCLUDE_DIR}
${PROJECT_BINARY_DIR}
${PROJECT_BINARY_DIR}/salome_adm