diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-21 16:41:43 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-21 16:41:43 +0300 |
commit | 39b7bfe6bdc53c08dd5eab7058dfc3d415dfe58c (patch) | |
tree | a476f61efd8381903897eb52d7898418d477a6b3 /build_files/cmake/macros.cmake | |
parent | 722376ed7baf73e3ab6727047130f19873113429 (diff) |
- check IF WIN32 AND NOT UNIX (for cygwin)
- patch from Mike S to enable OpenMP and xcode
Diffstat (limited to 'build_files/cmake/macros.cmake')
-rw-r--r-- | build_files/cmake/macros.cmake | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 3392398fd44..0da1d6c37dc 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -100,9 +100,9 @@ MACRO(SETUP_LIBDIRS) LINK_DIRECTORIES(${EXPAT_LIBPATH}) ENDIF(WITH_OPENCOLLADA) - IF(WIN32) + IF(WIN32 AND NOT UNIX) LINK_DIRECTORIES(${PTHREADS_LIBPATH}) - ENDIF(WIN32) + ENDIF(WIN32 AND NOT UNIX) ENDMACRO(SETUP_LIBDIRS) MACRO(SETUP_LIBLINKS @@ -115,12 +115,12 @@ MACRO(SETUP_LIBLINKS IF(WITH_PYTHON) TARGET_LINK_LIBRARIES(${target} ${PYTHON_LINKFLAGS}) - IF(WIN32) + IF(WIN32 AND NOT UNIX) TARGET_LINK_LIBRARIES(${target} debug ${PYTHON_LIB}_d) TARGET_LINK_LIBRARIES(${target} optimized ${PYTHON_LIB}) - ELSE(WIN32) + ELSE(WIN32 AND NOT UNIX) TARGET_LINK_LIBRARIES(${target} ${PYTHON_LIB}) - ENDIF(WIN32) + ENDIF(WIN32 AND NOT UNIX) ENDIF(WITH_PYTHON) TARGET_LINK_LIBRARIES(${target} ${OPENGL_glu_LIBRARY} ${JPEG_LIB} ${PNG_LIB} ${ZLIB_LIB}) @@ -129,9 +129,9 @@ MACRO(SETUP_LIBLINKS IF(WITH_INTERNATIONAL) TARGET_LINK_LIBRARIES(${target} ${GETTEXT_LIB}) - IF(WIN32) + IF(WIN32 AND NOT UNIX) TARGET_LINK_LIBRARIES(${target} ${ICONV_LIB}) - ENDIF(WIN32) + ENDIF(WIN32 AND NOT UNIX) ENDIF(WITH_INTERNATIONAL) IF(WITH_OPENAL) @@ -156,14 +156,14 @@ MACRO(SETUP_LIBLINKS TARGET_LINK_LIBRARIES(${target} ${TIFF_LIBRARY}) ENDIF(WITH_IMAGE_TIFF) IF(WITH_IMAGE_OPENEXR) - IF(WIN32) + IF(WIN32 AND NOT UNIX) FOREACH(loop_var ${OPENEXR_LIB}) TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d) TARGET_LINK_LIBRARIES(${target} optimized ${loop_var}) ENDFOREACH(loop_var) - ELSE(WIN32) + ELSE(WIN32 AND NOT UNIX) TARGET_LINK_LIBRARIES(${target} ${OPENEXR_LIB}) - ENDIF(WIN32) + ENDIF(WIN32 AND NOT UNIX) ENDIF(WITH_IMAGE_OPENEXR) IF(WITH_LCMS) TARGET_LINK_LIBRARIES(${target} ${LCMS_LIBRARY}) @@ -172,7 +172,7 @@ MACRO(SETUP_LIBLINKS TARGET_LINK_LIBRARIES(${target} ${FFMPEG_LIB}) ENDIF(WITH_FFMPEG) IF(WITH_OPENCOLLADA) - IF(WIN32) + IF(WIN32 AND NOT UNIX) FOREACH(loop_var ${OPENCOLLADA_LIB}) TARGET_LINK_LIBRARIES(${target} debug ${loop_var}_d) TARGET_LINK_LIBRARIES(${target} optimized ${loop_var}) @@ -183,21 +183,21 @@ MACRO(SETUP_LIBLINKS TARGET_LINK_LIBRARIES(${target} debug ${EXPAT_LIB}_d) TARGET_LINK_LIBRARIES(${target} optimized ${EXPAT_LIB}) ENDIF(EXPAT_LIB) - ELSE(WIN32) + ELSE(WIN32 AND NOT UNIX) TARGET_LINK_LIBRARIES(${target} ${OPENCOLLADA_LIB}) TARGET_LINK_LIBRARIES(${target} ${PCRE_LIB}) TARGET_LINK_LIBRARIES(${target} ${EXPAT_LIB}) - ENDIF(WIN32) + ENDIF(WIN32 AND NOT UNIX) ENDIF(WITH_OPENCOLLADA) IF(WITH_LCMS) - IF(WIN32) + IF(WIN32 AND NOT UNIX) TARGET_LINK_LIBRARIES(${target} debug ${LCMS_LIB}_d) TARGET_LINK_LIBRARIES(${target} optimized ${LCMS_LIB}) - ENDIF(WIN32) + ENDIF(WIN32 AND NOT UNIX) ENDIF(WITH_LCMS) - IF(WIN32) + IF(WIN32 AND NOT UNIX) TARGET_LINK_LIBRARIES(${target} ${PTHREADS_LIB}) - ENDIF(WIN32) + ENDIF(WIN32 AND NOT UNIX) ENDMACRO(SETUP_LIBLINKS) MACRO(TEST_SSE_SUPPORT) |