From 1a0b3be6dd2a4ea857ce5f538dcb72517389cefc Mon Sep 17 00:00:00 2001 From: Lendemor Date: Wed, 4 Jan 2017 18:37:00 +0100 Subject: [PATCH] why didn't i commit this before? --- template.cmake | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/template.cmake b/template.cmake index dbb2f14..f7e694b 100644 --- a/template.cmake +++ b/template.cmake @@ -42,6 +42,7 @@ elseif(UNIX) endif() endif() + #set dependencies paths set(DEPENDENCIES_ROOT ${PROJECT_SOURCE_DIR}/../cpp_dependencies) set(INCLUDE_ROOT ${DEPENDENCIES_ROOT}/include) @@ -53,8 +54,8 @@ if(${CMAKE_BUILD_TYPE} MATCHES "Debug") set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIB_DEBUG_PATH}) #for STATIC set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB_DEBUG_PATH}) #for SHARED - list(APPEND LIB_PATHS ${LIB_DEBUG_PATH}) - list(APPEND LIB_PATHS ${LIB_RELEASE_PATH}) + list(APPEND LIB_PATHS ${LIB_DEBUG_PATH}) + list(APPEND LIB_PATHS ${LIB_RELEASE_PATH}) else() set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${LIB_RELEASE_PATH}) #for STATIC set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${LIB_RELEASE_PATH}) #for SHARED @@ -173,7 +174,7 @@ if(SFML_MODULES) if(WIN32) LIST(APPEND LIB_SFML_LIST ${SFML_LIBRARY_WINDOW} gdi32) elseif(UNIX) - LIST(APPEND LIB_SFML_LIST ${SFML_LIBRARY_WINDOW} dl) + LIST(APPEND LIB_SFML_LIST ${SFML_LIBRARY_WINDOW}) endif() MESSAGE(STATUS "using SFML window") endif() @@ -350,7 +351,11 @@ if(USE_RENDERER) set(USE_OPENGL True) LIST(APPEND INCLUDE_PATHS ${PROJECT_SOURCE_DIR}/../SparrowRenderer/src) - LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_RENDERER_LIBRARY}) + if(UNIX) + LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_RENDERER_LIBRARY} dl) + else() + LIST(APPEND LIB_DEPENDENCIES_LIST ${SPARROW_RENDERER_LIBRARY}) + endif() endif() if(USE_OPENGL) @@ -366,7 +371,6 @@ include_directories( ) if(LIB_SRC_LIST) - # please do not add -ldl here for all systems without any explanation target_link_libraries( ${LIBRARY_NAME} ${LIB_DEPENDENCIES_LIST}