Parcourir la source

Fix installation directories

Daniele Bartolini il y a 12 ans
Parent
commit
2a8a86dd9c

+ 15 - 15
src/CMakeLists.txt

@@ -304,24 +304,24 @@ endif (WINDOWS)
 
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/Config.h)
 
-install (TARGETS crown DESTINATION lib)
-install (FILES ${HEADERS} DESTINATION include)
+install (TARGETS crown DESTINATION lib/${CMAKE_PROJECT_NAME})
+install (FILES ${HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME})
 
-install (FILES ${CORE_HEADERS} DESTINATION include/core)
-install (FILES ${BV_HEADERS} DESTINATION include/core/bv)
-install (FILES ${CONTAINERS_HEADERS} DESTINATION include/core/containers)
-install (FILES ${MATH_HEADERS} DESTINATION include/core/math)
-install (FILES ${STREAMS_HEADERS} DESTINATION include/core/streams)
-install (FILES ${MEM_HEADERS} DESTINATION include/core/mem)
-install (FILES ${COMPRESSORS_HEADERS} DESTINATION include/core/compressors)
-install (FILES ${THREADS_HEADERS} DESTINATION include/core/threads)
-install (FILES ${SETTINGS_HEADERS} DESTINATION include/core/settings)
+install (FILES ${CORE_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core)
+install (FILES ${BV_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core/bv)
+install (FILES ${CONTAINERS_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core/containers)
+install (FILES ${MATH_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core/math)
+install (FILES ${STREAMS_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core/streams)
+install (FILES ${MEM_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core/mem)
+install (FILES ${COMPRESSORS_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core/compressors)
+install (FILES ${THREADS_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core/threads)
+install (FILES ${SETTINGS_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/core/settings)
 
-install (FILES ${INPUT_HEADERS} DESTINATION include/input)
+install (FILES ${INPUT_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/input)
 
-install (FILES ${RENDERERS_HEADERS} DESTINATION include/renderers)
+install (FILES ${RENDERERS_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/renderers)
 
-install (FILES ${NETWORK_HEADERS} DESTINATION include/network)
+install (FILES ${NETWORK_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/network)
 
-install (FILES ${OS_HEADERS} DESTINATION include/os)
+install (FILES ${OS_HEADERS} DESTINATION include/${CMAKE_PROJECT_NAME}/os)
 

+ 1 - 1
src/os/linux/CMakeLists.txt

@@ -23,4 +23,4 @@ add_library(crown-linux STATIC ${LINUX_SRC} ${LINUX_HEADERS})
 
 target_link_libraries(crown-linux crown)
 
-install (TARGETS crown-linux DESTINATION lib)
+install (TARGETS crown-linux DESTINATION lib/${CMAKE_PROJECT_NAME})

+ 1 - 1
src/renderers/gl/CMakeLists.txt

@@ -24,4 +24,4 @@ add_library(crown-gl STATIC ${GL_SRC} ${GL_HEADERS})
 
 target_link_libraries(crown-gl crown)
 
-install (TARGETS crown-gl DESTINATION lib)
+install (TARGETS crown-gl DESTINATION lib/${CMAKE_PROJECT_NAME})

+ 1 - 1
src/renderers/gles/CMakeLists.txt

@@ -22,4 +22,4 @@ add_library(crown-gles STATIC ${GLES_SRC} ${GLES_HEADERS})
 
 target_link_libraries(crown-gles crown)
 
-install (TARGETS crown-gles DESTINATION lib)
+install (TARGETS crown-gles DESTINATION lib/${CMAKE_PROJECT_NAME})

+ 2 - 1
tools/compilers/CMakeLists.txt

@@ -24,7 +24,8 @@ add_subdirectory(txt)
 add_subdirectory(tga)
 #add_subdirectory(lua)
 
-install (TARGETS crown-compiler-utils DESTINATION lib)
+install (TARGETS crown-compiler-utils DESTINATION lib/${CMAKE_PROJECT_NAME})
+
 install (TARGETS resource-linker DESTINATION bin)
 install (TARGETS resource-hash DESTINATION bin)
 install (FILES resource-compiler.py DESTINATION bin)