diff --git a/CMakeLists.txt b/CMakeLists.txt index 30ca06f7..90ab3f09 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,5 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.6) PROJECT(PolyVox) -#ADD_SUBDIRECTORY(PolyVoxCore) -#ADD_SUBDIRECTORY(PolyVoxUtil) ADD_SUBDIRECTORY(library) ADD_SUBDIRECTORY(examples/OpenGL) \ No newline at end of file diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index f74b376f..ca4edad1 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -92,6 +92,7 @@ SOURCE_GROUP("Headers" FILES ${UTIL_INC_FILES}) #Tell CMake the paths INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) +#Core #Build ADD_LIBRARY(PolyVoxCore SHARED ${CORE_SRC_FILES} ${CORE_INC_FILES} ${IMPL_SRC_FILES} ${IMPL_INC_FILES}) SET_TARGET_PROPERTIES(PolyVoxCore PROPERTIES VERSION ${POLYVOX_VERSION} SOVERSION ${POLYVOX_VERSION_MAJOR}) @@ -108,6 +109,7 @@ INSTALL(TARGETS PolyVoxCore INSTALL(FILES ${CORE_INC_FILES} DESTINATION include/PolyVoxCore) +#Util #Build ADD_LIBRARY(PolyVoxUtil SHARED ${UTIL_SRC_FILES} ${UTIL_INC_FILES}) TARGET_LINK_LIBRARIES(PolyVoxUtil PolyVoxCore) @@ -125,7 +127,7 @@ INSTALL(TARGETS PolyVoxUtil INSTALL(FILES ${UTIL_INC_FILES} DESTINATION include/PolyVoxUtil) -#Set up OGREConfig.cmake +#Set up PolyVoxConfig.cmake if(WIN32) set(CONFIG_FILE_DIR "CMake") else(WIN32)