- include pthreads for win32 globally (as with opengl).
authorCampbell Barton <ideasman42@gmail.com>
Sun, 21 Nov 2010 09:10:50 +0000 (09:10 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 21 Nov 2010 09:10:50 +0000 (09:10 +0000)
- MSVC CFLAGS were being set by only checking WIN32, (breaking non-msvc win32 builds)

21 files changed:
CMakeLists.txt
source/blender/blenkernel/CMakeLists.txt
source/blender/blenlib/CMakeLists.txt
source/blender/blenpluginapi/CMakeLists.txt
source/blender/editors/armature/CMakeLists.txt
source/blender/editors/mesh/CMakeLists.txt
source/blender/editors/object/CMakeLists.txt
source/blender/editors/physics/CMakeLists.txt
source/blender/editors/render/CMakeLists.txt
source/blender/editors/screen/CMakeLists.txt
source/blender/editors/sculpt_paint/CMakeLists.txt
source/blender/editors/space_file/CMakeLists.txt
source/blender/editors/space_image/CMakeLists.txt
source/blender/editors/space_node/CMakeLists.txt
source/blender/editors/space_view3d/CMakeLists.txt
source/blender/gpu/CMakeLists.txt
source/blender/imbuf/CMakeLists.txt
source/blender/makesrna/intern/CMakeLists.txt
source/blender/nodes/CMakeLists.txt
source/blender/render/CMakeLists.txt
source/blender/windowmanager/CMakeLists.txt

index 0b34a723cafe40ccc6628b3a19ab7ad5f02beb83..0dc0a0b6e57ba5819af263726797f579d3a7ac22 100644 (file)
@@ -667,6 +667,9 @@ IF(WIN32)
 
        ENDIF(MSVC)
 
+       # used in many places so include globally, like OpenGL
+       INCLUDE_DIRECTORIES(${PTHREADS_INC})
+
 ENDIF(WIN32)
 
 
index eb564720915a97532711c52bbe6d7dbde6859090..d88b25d4335de9c6d12ee3b83d76bf7ff9b0d526 100644 (file)
@@ -213,9 +213,8 @@ IF(WITH_LZMA)
        ADD_DEFINITIONS(-DWITH_LZMA)
 ENDIF(WITH_LZMA)
 
-IF(WIN32)
+IF(MSVC)
     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
+ENDIF(MSVC)
 
 BLENDERLIB(bf_blenkernel "${SRC}" "${INC}")
index 35785447a86fb1bb0d9ec344fc1f4521d4b3052d..04745336497c953b1ffc562b2b0cbf398d134624 100644 (file)
@@ -86,10 +86,6 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
        LIST(APPEND INC "${BINRELOC_INC}")
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 IF(WITH_OPENMP)
        ADD_DEFINITIONS(-DPARALLEL=1)
 ENDIF(WITH_OPENMP)
index 41ec586438288e7d9663007f512c700904cc84c8..737fb3caf4bc23c5eed94a6818bf30227deb2a0e 100644 (file)
@@ -37,10 +37,6 @@ SET(SRC
        intern/pluginapi.c
 )
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 IF(WITH_QUICKTIME)
        LIST(APPEND INC ${QUICKTIME_INC})
        ADD_DEFINITIONS(-DWITH_QUICKTIME)
index 62b76655010317d976bf130aaf8bae10f9733f09..b79c77d6e9705f64f7616692461568a028e62112 100644 (file)
@@ -44,8 +44,4 @@ SET(SRC
        reeb.c
 )
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 BLENDERLIB(bf_editor_armature "${SRC}" "${INC}")
index 1e26f273b410268d9844682d70313113266873c4..41685b7e8bb1ea0544e0dd29adcb0f82ebadcebb 100644 (file)
@@ -45,8 +45,4 @@ SET(SRC
        meshtools.c
 )
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 BLENDERLIB(bf_editor_mesh "${SRC}" "${INC}")
index 224d72895bad301388240e0d1f9492316339dfd5..01b49a9e80b864cc2ad29a7260de448b09fcc826 100644 (file)
@@ -51,10 +51,6 @@ SET(SRC
        object_vgroup.c
 )
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 IF(WITH_PYTHON)
        ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
index 481f6d8df44542af306814dc9842f6529187a048..82c48becb0b5b4f76ac9fa4c7a7c08ed8ff9b040 100644 (file)
@@ -39,10 +39,6 @@ SET(SRC
        physics_pointcache.c
 )
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 IF(NOT WITH_MOD_FLUID)
        ADD_DEFINITIONS(-DDISABLE_ELBEEM)
 ENDIF(NOT WITH_MOD_FLUID)
index 57ee27c3b6b7a2c13d5da2b69ff9fa14014874aa..c4e997ce3ee1ffa81e41817397078838ddd88721 100644 (file)
@@ -52,8 +52,4 @@ IF(WITH_OPENMP)
        ADD_DEFINITIONS(-DPARALLEL=1)
 ENDIF(WITH_OPENMP)
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 BLENDERLIB(bf_editor_render "${SRC}" "${INC}")
index 4ea056ac400bceabf76356e21763399d8c7cf418..ff143bab4698fb0d8164039c304d5214ab96b8d8 100644 (file)
@@ -40,8 +40,4 @@ SET(SRC
        screendump.c
 )
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 BLENDERLIB(bf_editor_screen "${SRC}" "${INC}")
index 364677f9a8d0529eeceade669b97a948ceecb4da..6db61cee168b7b4f908c4159cc4a265d236df16f 100644 (file)
@@ -43,8 +43,4 @@ SET(SRC
        sculpt_undo.c
 )
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 BLENDERLIB(bf_editor_sculpt_paint "${SRC}" "${INC}")
index a4b402cce43c7b92664bcfc950d1052557f5377e..bc89b7e1850d8fee1389245a4a6aaa1c821317a3 100644 (file)
@@ -67,8 +67,4 @@ IF(WITH_IMAGE_HDR)
        ADD_DEFINITIONS(-DWITH_HDR)
 ENDIF(WITH_IMAGE_HDR)
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 BLENDERLIB(bf_editor_space_file "${SRC}" "${INC}")
index ca3b1f58305d007214d0048fc89d51d09c800bcb..d7415fb7067f2f8c6840a53ebdcb2487c3decf63 100644 (file)
@@ -61,8 +61,4 @@ IF(WITH_LCMS)
        ADD_DEFINITIONS(-DWITH_LCMS)
 ENDIF(WITH_LCMS)
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 BLENDERLIB(bf_editor_space_image "${SRC}" "${INC}")
index 887d79f8fb3039a6fbd3fde194d6d3f1853e894b..aa98bfc9c0b660aea044b9cad5796771b3731394 100644 (file)
@@ -45,8 +45,4 @@ SET(SRC
        space_node.c
 )
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 BLENDERLIB(bf_editor_space_node "${SRC}" "${INC}")
index e9ed8335061d15e59734b71d6588033ab35e463c..0820b69ee464499a93a55fcfbdd91ad20582aae4 100644 (file)
@@ -58,10 +58,6 @@ IF(WITH_GAMEENGINE)
        ADD_DEFINITIONS(-DWITH_GAMEENGINE)
 ENDIF(WITH_GAMEENGINE)
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 ADD_DEFINITIONS(-DGLEW_STATIC)
 
 BLENDERLIB(bf_editor_space_view3d "${SRC}" "${INC}")
index a2bfddd96fb5cbd76d1f37b40aeb4167527aab85..4045e83dafa84499ca29b84c6f530114c4a40c98 100644 (file)
@@ -46,10 +46,6 @@ SET(SRC
        intern/gpu_shader_vertex.glsl.c
 )
 
-IF(WIN32)
-       INCLUDE_DIRECTORIES(${PTHREADS_INC})
-ENDIF(WIN32)
-
 ADD_DEFINITIONS(-DGLEW_STATIC)
 
 BLENDERLIB(bf_gpu "${SRC}" "${INC}")
index f89ef033d7845d59dac8d220c7464a0dc0a6fd5c..36dcfefdc1ceec7f77cb4c26c4cc2eded0c85ffe 100644 (file)
@@ -66,10 +66,6 @@ SET(SRC
        intern/writeimage.c
 )
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 IF(WITH_IMAGE_OPENEXR)
        ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_IMAGE_OPENEXR)
index 8ca2f8a18a9cf2dea0ca481d7518ad50ebbc267c..4880572d1e59b0399f1994479fdeefbb92cfd9f7 100644 (file)
@@ -69,10 +69,6 @@ IF(WITH_PYTHON)
        ADD_DEFINITIONS(-DWITH_PYTHON)
 ENDIF(WITH_PYTHON)
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 IF(WITH_GAMEENGINE)
        ADD_DEFINITIONS(-DWITH_GAMEENGINE)
 ENDIF(WITH_GAMEENGINE)
index 5a6470d994ebabdce02569d82a6a57ca161d93a2..38e670f256d5a374ce16a9e458257cb1eae61ff1 100644 (file)
@@ -140,10 +140,6 @@ SET(SRC
        intern/node_util.c
 )
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 IF(WITH_PYTHON)
        SET(INC ${INC} ../python ${PYTHON_INC})
        ADD_DEFINITIONS(-DWITH_PYTHON)
index 1224e51ff3ff28171fe51252e7f19adac31483fe..7a2b92404ae17ad8cfb47df8d24207aeb5e7f4d7 100644 (file)
@@ -77,10 +77,6 @@ SET(SRC
        intern/source/zbuf.c
 )
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 IF(WITH_IMAGE_OPENEXR)
        ADD_DEFINITIONS(-DWITH_OPENEXR)
 ENDIF(WITH_IMAGE_OPENEXR)
index 6c93334fd0a99a6effd385e97296365a5082bdae..e47d85cd4621ca1c385711134dfe47a8213f32d9 100644 (file)
@@ -93,10 +93,6 @@ IF(WITH_GAMEENGINE)
        ADD_DEFINITIONS(-DWITH_GAMEENGINE)
 ENDIF(WITH_GAMEENGINE)
 
-IF(WIN32)
-       LIST(APPEND INC ${PTHREADS_INC})
-ENDIF(WIN32)
-
 IF(WITH_COCOA)
        LIST(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/wm_apple.c")
 ENDIF(WITH_COCOA)