AnotherFoxGuy/polyvox
1
0
Fork 0
Code Issues Pull Requests Activity

Update Linux install paths to be FHS compliant. Windows paths should be unchanged.

Browse Source
This commit is contained in:
Matt Williams 2009-08-31 18:25:26 +00:00
parent 099c5c7fbf
commit 9df6288c67
5 changed files with 60 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
examples/OpenGL/CMakeLists.txt
View File

@ -56,15 +56,15 @@ LINK_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/../../library/PolyVoxCore/debug ${C
ADD_EXECUTABLE(OpenGLExample ${SRC_FILES}) ADD_EXECUTABLE(OpenGLExample ${SRC_FILES})
TARGET_LINK_LIBRARIES(OpenGLExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} debug PolyVoxCore_d optimized PolyVoxCore) TARGET_LINK_LIBRARIES(OpenGLExample ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} debug PolyVoxCore_d optimized PolyVoxCore)
#Install #Install - Only install the example in Windows
INSTALL(TARGETS OpenGLExample
RUNTIME DESTINATION Examples/OpenGL/bin
LIBRARY DESTINATION Examples/OpenGL/lib
ARCHIVE DESTINATION Examples/OpenGL/lib
COMPONENT example
)
IF(WIN32) IF(WIN32)
INSTALL(TARGETS OpenGLExample
RUNTIME DESTINATION Examples/OpenGL/bin
LIBRARY DESTINATION Examples/OpenGL/lib
ARCHIVE DESTINATION Examples/OpenGL/lib
COMPONENT example
)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../library/PolyVoxCore/release/PolyVoxCore.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Release) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../library/PolyVoxCore/release/PolyVoxCore.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Release)
INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../library/PolyVoxUtil/release/PolyVoxUtil.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Release) INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/../../library/PolyVoxUtil/release/PolyVoxUtil.dll DESTINATION Examples/OpenGL/bin CONFIGURATIONS Release)

11
library/CMakeLists.txt
View File

@ -8,8 +8,16 @@ add_subdirectory(PolyVoxUtil)
#Set up PolyVoxConfig.cmake #Set up PolyVoxConfig.cmake
if(WIN32) if(WIN32)
set(CONFIG_FILE_DIR "CMake") set(CONFIG_FILE_DIR "CMake")
set(PolyVoxCore_LIBRARY_INSTALL_DIRS "PolyVoxCore/lib")
set(PolyVoxUtil_LIBRARY_INSTALL_DIRS "PolyVoxUtil/lib")
set(PolyVoxCore_INCLUDE_INSTALL_DIRS "PolyVoxCore/include")
set(PolyVoxUtil_INCLUDE_INSTALL_DIRS "PolyVoxUtil/include")
else(WIN32) else(WIN32)
set(CONFIG_FILE_DIR "share/PolyVox/cmake") set(CONFIG_FILE_DIR "share/PolyVox/cmake")
set(PolyVoxCore_LIBRARY_INSTALL_DIRS "lib")
set(PolyVoxUtil_LIBRARY_INSTALL_DIRS "lib")
set(PolyVoxCore_INCLUDE_INSTALL_DIRS "include/PolyVoxCore")
set(PolyVoxUtil_INCLUDE_INSTALL_DIRS "include/PolyVoxUtil")
endif(WIN32) endif(WIN32)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PolyVoxConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PolyVoxConfig.cmake @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/PolyVoxConfig.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/PolyVoxConfig.cmake @ONLY)
@ -17,8 +25,9 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/PolyVoxConfig.cmake DESTINATION ${CONF
find_package(Doxygen) find_package(Doxygen)
if(DOXYGEN_FOUND) if(DOXYGEN_FOUND)
#configure_file(${CMAKE_CURRENT_SOURCE_DIR}/polyvox.css ${CMAKE_CURRENT_BINARY_DIR}/polyvox.css)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile)
add_custom_target(doc COMMAND ${DOXYGEN_EXECUTABLE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building documentation" VERBATIM) add_custom_target(doc COMMAND ${DOXYGEN_EXECUTABLE} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Building documentation" VERBATIM)
endif() endif()
add_subdirectory(bindings) #add_subdirectory(bindings)

4
library/PolyVoxConfig.cmake.in
View File

@ -14,8 +14,8 @@
include(FindPackageMessage) include(FindPackageMessage)
set(PREFIX "@CMAKE_INSTALL_PREFIX@") set(PREFIX "@CMAKE_INSTALL_PREFIX@")
set(PolyVox_LIBRARY_DIRS "${PREFIX}/PolyVoxCore/lib" "${PREFIX}/PolyVoxUtil/lib") set(PolyVox_LIBRARY_DIRS "${PREFIX}/@PolyVoxCore_LIBRARY_INSTALL_DIRS@" "${PREFIX}/@PolyVoxUtil_LIBRARY_INSTALL_DIRS@")
set(PolyVox_INCLUDE_DIRS "${PREFIX}/PolyVoxCore/include" "${PREFIX}/PolyVoxUtil/include" "${PREFIX}/include") set(PolyVox_INCLUDE_DIRS "${PREFIX}/@PolyVoxCore_INCLUDE_INSTALL_DIRS@" "${PREFIX}/@PolyVoxCore_INCLUDE_INSTALL_DIRS@" "${PREFIX}/include")
set(PolyVox_LIBRARIES "PolyVoxUtil" "PolyVoxCore") set(PolyVox_LIBRARIES "PolyVoxUtil" "PolyVoxCore")
message(STATUS "Found PolyVox") message(STATUS "Found PolyVox")

28
library/PolyVoxCore/CMakeLists.txt
View File

@ -70,13 +70,25 @@ IF(WIN32)
ENDIF(WIN32) ENDIF(WIN32)
#Install #Install
INSTALL(TARGETS PolyVoxCore IF(WIN32)
RUNTIME DESTINATION PolyVoxCore/bin INSTALL(TARGETS PolyVoxCore
LIBRARY DESTINATION PolyVoxCore/lib RUNTIME DESTINATION PolyVoxCore/bin
ARCHIVE DESTINATION PolyVoxCore/lib LIBRARY DESTINATION PolyVoxCore/lib
COMPONENT library ARCHIVE DESTINATION PolyVoxCore/lib
) COMPONENT library
)
#Install the core header files, including the ones in the PolyVoxImpl subfolder. #Install the core header files, including the ones in the PolyVoxImpl subfolder.
INSTALL(DIRECTORY include DESTINATION PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE) INSTALL(DIRECTORY include DESTINATION PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE)
ELSE(WIN32)
INSTALL(TARGETS PolyVoxCore
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
COMPONENT library
)
#Install the core header files, including the ones in the PolyVoxImpl subfolder.
INSTALL(DIRECTORY include/ DESTINATION include/PolyVoxCore COMPONENT development PATTERN "*.svn*" EXCLUDE)
ENDIF(WIN32)

28
library/PolyVoxUtil/CMakeLists.txt
View File

@ -40,12 +40,24 @@ IF(WIN32)
ENDIF(WIN32) ENDIF(WIN32)
#Install #Install
INSTALL(TARGETS PolyVoxUtil IF(WIN32)
RUNTIME DESTINATION PolyVoxUtil/bin INSTALL(TARGETS PolyVoxUtil
LIBRARY DESTINATION PolyVoxUtil/lib RUNTIME DESTINATION PolyVoxUtil/bin
ARCHIVE DESTINATION PolyVoxUtil/lib LIBRARY DESTINATION PolyVoxUtil/lib
COMPONENT library ARCHIVE DESTINATION PolyVoxUtil/lib
) COMPONENT library
)
#Install the util header files. #Install the util header files.
INSTALL(DIRECTORY include DESTINATION PolyVoxUtil COMPONENT development PATTERN "*.svn*" EXCLUDE) INSTALL(DIRECTORY include DESTINATION PolyVoxUtil COMPONENT development PATTERN "*.svn*" EXCLUDE)
ELSE(WIN32)
INSTALL(TARGETS PolyVoxUtil
RUNTIME DESTINATION bin
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
COMPONENT library
)
#Install the core header files, including the ones in the PolyVoxImpl subfolder.
INSTALL(DIRECTORY include/ DESTINATION include/PolyVoxUtil COMPONENT development PATTERN "*.svn*" EXCLUDE)
ENDIF(WIN32)