diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-10-30 04:58:44 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-10-30 04:59:36 +0300 |
| commit | e8daf2e3ea17c2e9569e6fc9b49879c74d9a8c22 (patch) | |
| tree | 4c37348d66843bcd4a4a02372af0bf323c22c4fb /build_files/cmake/macros.cmake | |
| parent | 475ec5269ae8f7c30795c2e771100e087b5dd315 (diff) | |
CMake: cleanup
Diffstat (limited to 'build_files/cmake/macros.cmake')
| -rw-r--r-- | build_files/cmake/macros.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 7eb3af86985..6998595a6fc 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -282,7 +282,7 @@ function(SETUP_LIBDIRS) # NOTE: For all new libraries, use absolute library paths. # This should eventually be phased out. - if (NOT MSVC) + if(NOT MSVC) link_directories(${JPEG_LIBPATH} ${PNG_LIBPATH} ${ZLIB_LIBPATH} ${FREETYPE_LIBPATH}) if(WITH_PYTHON) # AND NOT WITH_PYTHON_MODULE # WIN32 needs @@ -342,7 +342,7 @@ function(SETUP_LIBDIRS) if(WIN32 AND NOT UNIX) link_directories(${PTHREADS_LIBPATH}) endif() - endif(NOT MSVC) + endif() endfunction() function(setup_liblinks @@ -1546,8 +1546,8 @@ macro(openmp_delayload SET_TARGET_PROPERTIES(${projectname} PROPERTIES LINK_FLAGS_DEBUG "/DELAYLOAD:${OPENMP_DLL_NAME}d.dll delayimp.lib") SET_TARGET_PROPERTIES(${projectname} PROPERTIES LINK_FLAGS_RELWITHDEBINFO "/DELAYLOAD:${OPENMP_DLL_NAME}.dll delayimp.lib") SET_TARGET_PROPERTIES(${projectname} PROPERTIES LINK_FLAGS_MINSIZEREL "/DELAYLOAD:${OPENMP_DLL_NAME}.dll delayimp.lib") - endif(WITH_OPENMP) - endif(MSVC) + endif() + endif() endmacro() MACRO(WINDOWS_SIGN_TARGET target) |