From fce8089264f72414b83b04c8ccae537b22f60133 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Sun, 24 Apr 2011 14:50:13 +0200 Subject: [PATCH] Update ADD_DEPENDENCIES calls Update for the static and dynamic options and add some more calls for PolyVoxUtil and the tests. --- CMakeLists.txt | 13 ++++++++++--- library/PolyVoxUtil/CMakeLists.txt | 2 ++ tests/CMakeLists.txt | 6 ++++++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f4507f2b..6332d089 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,9 +42,16 @@ IF(ENABLE_EXAMPLES) ADD_SUBDIRECTORY(examples/Basic) ADD_SUBDIRECTORY(examples/Paging) ADD_SUBDIRECTORY(examples/OpenGL) - ADD_DEPENDENCIES(BasicExample PolyVoxCore PolyVoxUtil) - ADD_DEPENDENCIES(PagingExample PolyVoxCore PolyVoxUtil) - ADD_DEPENDENCIES(OpenGLExample PolyVoxCore PolyVoxUtil) + if(BUILD_STATIC_LIBRARIES) + ADD_DEPENDENCIES(BasicExample PolyVoxCoreStatic PolyVoxUtilStatic) + ADD_DEPENDENCIES(PagingExample PolyVoxCoreStatic PolyVoxUtilStatic) + ADD_DEPENDENCIES(OpenGLExample PolyVoxCoreStatic PolyVoxUtilStatic) + endif() + if(BUILD_DYNAMIC_LIBRARIES) + ADD_DEPENDENCIES(BasicExample PolyVoxCoreDynamic PolyVoxUtilDynamic) + ADD_DEPENDENCIES(PagingExample PolyVoxCoreDynamic PolyVoxUtilDynamic) + ADD_DEPENDENCIES(OpenGLExample PolyVoxCoreDynamic PolyVoxUtilDynamic) + endif() ENDIF(ENABLE_EXAMPLES) INCLUDE(Packaging.cmake) diff --git a/library/PolyVoxUtil/CMakeLists.txt b/library/PolyVoxUtil/CMakeLists.txt index 22d702d8..c56d15e4 100644 --- a/library/PolyVoxUtil/CMakeLists.txt +++ b/library/PolyVoxUtil/CMakeLists.txt @@ -37,6 +37,7 @@ IF(BUILD_STATIC_LIBRARIES) IF(MSVC) SET_TARGET_PROPERTIES(PolyVoxUtilStatic PROPERTIES COMPILE_FLAGS "/wd4251") #Disable warning on STL exports ENDIF(MSVC) + ADD_DEPENDENCIES(PolyVoxUtilStatic PolyVoxCoreStatic) ENDIF() IF(BUILD_DYNAMIC_LIBRARIES) ADD_LIBRARY(PolyVoxUtilDynamic SHARED ${UTIL_SRC_FILES} ${UTIL_INC_FILES}) @@ -47,6 +48,7 @@ IF(BUILD_DYNAMIC_LIBRARIES) IF(MSVC) SET_TARGET_PROPERTIES(PolyVoxUtilDynamic PROPERTIES COMPILE_FLAGS "/wd4251") #Disable warning on STL exports ENDIF(MSVC) + ADD_DEPENDENCIES(PolyVoxUtilDynamic PolyVoxCoreDynamic) ENDIF() #Install diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7af0b766..0661e4b0 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,6 +14,12 @@ MACRO(CREATE_TEST headerfile sourcefile executablename) ELSE(WIN32) SET(LATEST_TEST ${CMAKE_CURRENT_BINARY_DIR}/${executablename}) ENDIF(WIN32) + if(BUILD_STATIC_LIBRARIES) + ADD_DEPENDENCIES(${executablename} PolyVoxCoreStatic PolyVoxUtilStatic) + endif() + if(BUILD_DYNAMIC_LIBRARIES) + ADD_DEPENDENCIES(${executablename} PolyVoxCoreDynamic PolyVoxUtilDynamic) + endif() ENDMACRO(CREATE_TEST) IF(NOT QT_QTTEST_FOUND)