From 1959564a6c27e7e944ddb0d838394c5c29cb39aa Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Thu, 21 Apr 2011 22:11:31 +0200 Subject: [PATCH] Add POLYVOX_SHARED defines This is needed for dllexport on Windows Signed-off-by: Matt Williams --- examples/Basic/CMakeLists.txt | 3 +++ examples/OpenGL/CMakeLists.txt | 3 +++ examples/Paging/CMakeLists.txt | 3 +++ library/PolyVoxCore/CMakeLists.txt | 2 +- library/PolyVoxUtil/CMakeLists.txt | 2 +- tests/CMakeLists.txt | 3 +++ 6 files changed, 14 insertions(+), 2 deletions(-) diff --git a/examples/Basic/CMakeLists.txt b/examples/Basic/CMakeLists.txt index fe9cf7c..c795106 100644 --- a/examples/Basic/CMakeLists.txt +++ b/examples/Basic/CMakeLists.txt @@ -36,6 +36,9 @@ LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}/debug ${PolyVoxCore_BINARY_DIR}/relea #Build ADD_EXECUTABLE(BasicExample ${SRC_FILES}) TARGET_LINK_LIBRARIES(BasicExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) +IF(BUILD_DYNAMIC_LIBRARIES) + SET_TARGET_PROPERTIES(BasicExample PROPERTIES COMPILE_FLAGS "-DPOLYVOX_SHARED") +ENDIF() #Install - Only install the example in Windows IF(WIN32) diff --git a/examples/OpenGL/CMakeLists.txt b/examples/OpenGL/CMakeLists.txt index 570412c..d7c5e81 100644 --- a/examples/OpenGL/CMakeLists.txt +++ b/examples/OpenGL/CMakeLists.txt @@ -42,6 +42,9 @@ LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}/debug ${PolyVoxCore_BINARY_DIR}/relea #Build ADD_EXECUTABLE(OpenGLExample ${SRC_FILES}) TARGET_LINK_LIBRARIES(OpenGLExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) +IF(BUILD_DYNAMIC_LIBRARIES) + SET_TARGET_PROPERTIES(OpenGLExample PROPERTIES COMPILE_FLAGS "-DPOLYVOX_SHARED") +ENDIF() #Install - Only install the example in Windows IF(WIN32) diff --git a/examples/Paging/CMakeLists.txt b/examples/Paging/CMakeLists.txt index 2ddf3e0..6f24d48 100644 --- a/examples/Paging/CMakeLists.txt +++ b/examples/Paging/CMakeLists.txt @@ -38,6 +38,9 @@ LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR}/debug ${PolyVoxCore_BINARY_DIR}/relea #Build ADD_EXECUTABLE(PagingExample ${SRC_FILES}) TARGET_LINK_LIBRARIES(PagingExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) +IF(BUILD_DYNAMIC_LIBRARIES) + SET_TARGET_PROPERTIES(PagingExample PROPERTIES COMPILE_FLAGS "-DPOLYVOX_SHARED") +ENDIF() #Install - Only install the example in Windows IF(WIN32) diff --git a/library/PolyVoxCore/CMakeLists.txt b/library/PolyVoxCore/CMakeLists.txt index 26e8cf6..3862842 100644 --- a/library/PolyVoxCore/CMakeLists.txt +++ b/library/PolyVoxCore/CMakeLists.txt @@ -106,7 +106,7 @@ ENDIF() IF(BUILD_DYNAMIC_LIBRARIES) ADD_LIBRARY(PolyVoxCoreDynamic SHARED ${CORE_SRC_FILES} ${CORE_INC_FILES} ${IMPL_SRC_FILES} ${IMPL_INC_FILES}) SET_TARGET_PROPERTIES(PolyVoxCoreDynamic PROPERTIES OUTPUT_NAME "PolyVoxCore") - SET_TARGET_PROPERTIES(PolyVoxCoreDynamic PROPERTIES COMPILE_FLAGS "-DPOLYVOX_SHARED_EXPORTS") + SET_TARGET_PROPERTIES(PolyVoxCoreDynamic PROPERTIES COMPILE_FLAGS "-DPOLYVOX_SHARED_EXPORTS -DPOLYVOX_SHARED") SET_TARGET_PROPERTIES(PolyVoxCoreDynamic PROPERTIES VERSION ${POLYVOX_VERSION} SOVERSION ${POLYVOX_VERSION_MAJOR}) IF(MSVC) SET_TARGET_PROPERTIES(PolyVoxCoreDynamic PROPERTIES COMPILE_FLAGS "/wd4251") #Disable warning on STL exports diff --git a/library/PolyVoxUtil/CMakeLists.txt b/library/PolyVoxUtil/CMakeLists.txt index 22d702d..2ac3ddc 100644 --- a/library/PolyVoxUtil/CMakeLists.txt +++ b/library/PolyVoxUtil/CMakeLists.txt @@ -42,7 +42,7 @@ IF(BUILD_DYNAMIC_LIBRARIES) ADD_LIBRARY(PolyVoxUtilDynamic SHARED ${UTIL_SRC_FILES} ${UTIL_INC_FILES}) TARGET_LINK_LIBRARIES(PolyVoxUtilDynamic PolyVoxCore) SET_TARGET_PROPERTIES(PolyVoxUtilDynamic PROPERTIES OUTPUT_NAME "PolyVoxUtil") - SET_TARGET_PROPERTIES(PolyVoxUtilDynamic PROPERTIES COMPILE_FLAGS "-DPOLYVOX_SHARED_EXPORTS") + SET_TARGET_PROPERTIES(PolyVoxUtilDynamic PROPERTIES COMPILE_FLAGS "-DPOLYVOX_SHARED_EXPORTS -DPOLYVOX_SHARED") SET_TARGET_PROPERTIES(PolyVoxUtilDynamic PROPERTIES VERSION ${POLYVOX_VERSION} SOVERSION ${POLYVOX_VERSION_MAJOR}) IF(MSVC) SET_TARGET_PROPERTIES(PolyVoxUtilDynamic PROPERTIES COMPILE_FLAGS "/wd4251") #Disable warning on STL exports diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7af0b76..a3746fd 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -7,6 +7,9 @@ MACRO(CREATE_TEST headerfile sourcefile executablename) QT4_WRAP_CPP(test_moc_SRCS ${headerfile}) LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR} ${PolyVoxUtil_BINARY_DIR}) ADD_EXECUTABLE(${executablename} ${sourcefile} ${test_moc_SRCS}) + IF(BUILD_DYNAMIC_LIBRARIES) + SET_TARGET_PROPERTIES(${executablename} PROPERTIES COMPILE_FLAGS "-DPOLYVOX_SHARED") + ENDIF() TARGET_LINK_LIBRARIES(${executablename} PolyVoxCore PolyVoxUtil ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY}) #HACK. This is needed since everything is built in the base dir in Windows. As of 2.8 we should change this. IF(WIN32) -- 1.7.4.2