nojhan/paradiseo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

regression: local/local

Browse source
This commit is contained in:
canape 2013-01-02 11:47:17 +01:00
commit a3c6c8c16e
10 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
edo/src/CMakeLists.txt
View file

@ -14,7 +14,7 @@ set(LIBRARY_OUTPUT_PATH ${EDO_LIB_OUTPUT_PATH})
######################################################################################
file(GLOB HDRS edo)
install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/edo COMPONENT headers)
install(FILES ${HDRS} DESTINATION include${INSTALL_SUB_DIR}/edo COMPONENT headers)
######################################################################################
@ -22,7 +22,7 @@ install(FILES ${HDRS} DESTINATION local/include${INSTALL_SUB_DIR}/edo COMPONENT
######################################################################################
install(DIRECTORY utils
DESTINATION local/include${INSTALL_SUB_DIR}/edo
DESTINATION include${INSTALL_SUB_DIR}/edo
COMPONENT headers
FILES_MATCHING PATTERN "*.h"
)

2
edo/src/utils/CMakeLists.txt
View file

@ -14,7 +14,7 @@ set(LIBRARY_OUTPUT_PATH ${EDOUTILS_LIB_OUTPUT_PATH})
file(GLOB SOURCES *.cpp)
add_library(edoutils ${SOURCES})
install(TARGETS edoutils ARCHIVE DESTINATION local/${LIB} COMPONENT libraries)
install(TARGETS edoutils ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
set(EDOUTILS_VERSION ${GLOBAL_VERSION})
set_target_properties(edoutils PROPERTIES VERSION "${EDOUTILS_VERSION}")