diff options
Diffstat (limited to 'build_files/cmake/platform')
| -rw-r--r-- | build_files/cmake/platform/platform_apple.cmake | 12 | ||||
| -rw-r--r-- | build_files/cmake/platform/platform_win32.cmake | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/build_files/cmake/platform/platform_apple.cmake b/build_files/cmake/platform/platform_apple.cmake index 3ae3b2b66b5..578ad143d59 100644 --- a/build_files/cmake/platform/platform_apple.cmake +++ b/build_files/cmake/platform/platform_apple.cmake @@ -100,8 +100,8 @@ if(WITH_PYTHON) set(PYTHON_INCLUDE_DIR "${_py_framework}/include/python${PYTHON_VERSION}m") set(PYTHON_EXECUTABLE "${_py_framework}/bin/python${PYTHON_VERSION}m") set(PYTHON_LIBPATH "${_py_framework}/lib/python${PYTHON_VERSION}/config-${PYTHON_VERSION}m") - #set(PYTHON_LIBRARY python${PYTHON_VERSION}) - #set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework Python") # won't build with this enabled + # set(PYTHON_LIBRARY python${PYTHON_VERSION}) + # set(PYTHON_LINKFLAGS "-u _PyMac_Error -framework Python") # won't build with this enabled unset(_py_framework) endif() @@ -218,12 +218,12 @@ if(WITH_OPENCOLLADA) ${OPENCOLLADA_LIBPATH}/libxml2.a ) # PCRE is bundled with openCollada - #set(PCRE ${LIBDIR}/pcre) - #set(PCRE_LIBPATH ${PCRE}/lib) + # set(PCRE ${LIBDIR}/pcre) + # set(PCRE_LIBPATH ${PCRE}/lib) set(PCRE_LIBRARIES pcre) # libxml2 is used - #set(EXPAT ${LIBDIR}/expat) - #set(EXPAT_LIBPATH ${EXPAT}/lib) + # set(EXPAT ${LIBDIR}/expat) + # set(EXPAT_LIBPATH ${EXPAT}/lib) set(EXPAT_LIB) endif() diff --git a/build_files/cmake/platform/platform_win32.cmake b/build_files/cmake/platform/platform_win32.cmake index ef7722b0aef..e2006be8fc2 100644 --- a/build_files/cmake/platform/platform_win32.cmake +++ b/build_files/cmake/platform/platform_win32.cmake @@ -160,7 +160,7 @@ set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} /MT") set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /MT") set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} /MT") -#JMC is available on msvc 15.8 (1915) and up +# JMC is available on msvc 15.8 (1915) and up if(MSVC_VERSION GREATER 1914 AND NOT MSVC_CLANG) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /JMC") endif() @@ -587,7 +587,7 @@ endif() # used in many places so include globally, like OpenGL blender_include_dirs_sys("${PTHREADS_INCLUDE_DIRS}") -#find signtool +# Find signtool. set(ProgramFilesX86_NAME "ProgramFiles(x86)") #env dislikes the ( ) find_program(SIGNTOOL_EXE signtool HINTS |