diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-07-25 08:35:53 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-07-25 08:35:53 +0400 |
| commit | 369d96bacca0db7296116698be2d4fc97c51639f (patch) | |
| tree | 8814c04c696844c19b18cbda68b8e903db3cea1c /CMakeLists.txt | |
| parent | 6582215f87015f3909f318a5b8c3b5d48c968424 (diff) | |
CMake: use a list for PLATFORM_LINKLIBS
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 812b026f18c..b6fdccfe635 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -886,18 +886,18 @@ if(UNIX AND NOT APPLE) endif() # OpenSuse needs lutil, ArchLinux not, for now keep, can avoid by using --as-needed - set(PLATFORM_LINKLIBS "-lutil -lc -lm -lpthread") + list(APPEND PLATFORM_LINKLIBS -lutil -lc -lm -lpthread) if((NOT WITH_HEADLESS) AND (NOT WITH_GHOST_SDL)) find_package(X11 REQUIRED) find_path(X11_XF86keysym_INCLUDE_PATH X11/XF86keysym.h ${X11_INC_SEARCH_PATH}) mark_as_advanced(X11_XF86keysym_INCLUDE_PATH) - set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_X11_LIB}") + list(APPEND PLATFORM_LINKLIBS ${X11_X11_LIB}) if(WITH_X11_XINPUT) if(X11_Xinput_LIB) - set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xinput_LIB}") + list(APPEND PLATFORM_LINKLIBS ${X11_Xinput_LIB}) else() set(WITH_X11_XINPUT OFF) endif() @@ -905,10 +905,10 @@ if(UNIX AND NOT APPLE) if(WITH_X11_XF86VMODE) # XXX, why dont cmake make this available? - FIND_LIBRARY(X11_Xxf86vmode_LIB Xxf86vm ${X11_LIB_SEARCH_PATH}) + find_library(X11_Xxf86vmode_LIB Xxf86vm ${X11_LIB_SEARCH_PATH}) mark_as_advanced(X11_Xxf86vmode_LIB) if(X11_Xxf86vmode_LIB) - set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} ${X11_Xxf86vmode_LIB}") + list(APPEND PLATFORM_LINKLIBS ${X11_Xxf86vmode_LIB}) else() set(WITH_X11_XF86VMODE OFF) endif() @@ -970,7 +970,7 @@ elseif(WIN32) if(MSVC) - set(PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid psapi) + list(APPEND PLATFORM_LINKLIBS ws2_32 vfw32 winmm kernel32 user32 gdi32 comdlg32 advapi32 shfolder shell32 ole32 oleaut32 uuid psapi) add_definitions( -D_CRT_NONSTDC_NO_DEPRECATE @@ -1348,12 +1348,12 @@ elseif(WIN32) endif() endif() - set(PLATFORM_LINKLIBS "-lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32 -lpsapi") + list(APPEND PLATFORM_LINKLIBS -lshell32 -lshfolder -lgdi32 -lmsvcrt -lwinmm -lmingw32 -lm -lws2_32 -lz -lstdc++ -lole32 -luuid -lwsock32 -lpsapi) set(PLATFORM_CFLAGS "-pipe -funsigned-char -fno-strict-aliasing") if(WITH_MINGW64) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fpermissive") - set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -lpthread") + list(APPEND PLATFORM_LINKLIBS -lpthread) add_definitions(-DFREE_WINDOWS64 -DMS_WIN64) endif() @@ -1528,7 +1528,7 @@ elseif(WIN32) LLVMX86Utils LLVMipa LLVMipo LLVMCore) # imagehelp is needed by LLVM 3.1 on MinGW, check lib\Support\Windows\Signals.inc - set(PLATFORM_LINKLIBS "${PLATFORM_LINKLIBS} -limagehlp") + list(APPEND PLATFORM_LINKLIBS -limagehlp) endif() if(WITH_OPENCOLORIO) @@ -1711,9 +1711,9 @@ elseif(APPLE) ) mark_as_advanced(SYSTEMSTUBS_LIBRARY) if(SYSTEMSTUBS_LIBRARY) - set(PLATFORM_LINKLIBS stdc++ SystemStubs) + list(APPEND PLATFORM_LINKLIBS stdc++ SystemStubs) else() - set(PLATFORM_LINKLIBS stdc++) + list(APPEND PLATFORM_LINKLIBS stdc++) endif() set(PLATFORM_CFLAGS "-pipe -funsigned-char") |