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

regression with local directory and {LIB} directory

Browse source
This commit is contained in:
canape 2013-01-03 10:25:08 +01:00
commit 3813828dce
7 changed files with 15 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmake/Macro.cmake
View file

@ -30,7 +30,7 @@ macro(add_lesson module target files)
elseif(${module} MATCHES smp) elseif(${module} MATCHES smp)
target_link_libraries(${i} smp eo eoutils) target_link_libraries(${i} smp eo eoutils)
endif() endif()
install(TARGETS ${i} RUNTIME DESTINATION ${INSTALL_BASE}/share${INSTALL_SUB_DIR}/${module}/tutorial/${target} COMPONENT examples) install(TARGETS ${i} RUNTIME DESTINATION share${INSTALL_SUB_DIR}/${module}/tutorial/${target} COMPONENT examples)
endforeach(i) endforeach(i)
# Custom target # Custom target

5
eo/src/ga/CMakeLists.txt
View file

@ -23,10 +23,7 @@ set(GA_SOURCES
) )
add_library(ga STATIC ${GA_SOURCES}) add_library(ga STATIC ${GA_SOURCES})
install(TARGETS ga ARCHIVE DESTINATION lib COMPONENT libraries) install(TARGETS ga ARCHIVE DESTINATION ${LIB} COMPONENT libraries)
file(GLOB HDRS *.h)
install(FILES ${HDRS} DESTINATION include/eo/ga COMPONENT headers)
###################################################################################### ######################################################################################
### 3) Optionnal ### 3) Optionnal

6
eo/tutorial/Lesson2/CMakeLists.txt
View file

@ -53,8 +53,8 @@ target_link_libraries(exercise2.3 ga eo eoutils)
### 6) Configure project installation paths ### 6) Configure project installation paths
###################################################################################### ######################################################################################
install(TARGETS FirstBitEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples) install(TARGETS FirstBitEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples)
install(TARGETS FirstRealEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples) install(TARGETS FirstRealEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples)
install(TARGETS exercise2.3 RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples) install(TARGETS exercise2.3 RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson2 COMPONENT examples)
###################################################################################### ######################################################################################

6
eo/tutorial/Lesson3/CMakeLists.txt
View file

@ -57,8 +57,8 @@ target_link_libraries(exercise3.1 ga eoutils eo)
### 6) Configure project installation paths ### 6) Configure project installation paths
###################################################################################### ######################################################################################
install(TARGETS SecondBitEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples) install(TARGETS SecondBitEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples)
install(TARGETS SecondRealEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples) install(TARGETS SecondRealEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples)
install(TARGETS exercise3.1 RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples) install(TARGETS exercise3.1 RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson3 COMPONENT examples)
###################################################################################### ######################################################################################

6
eo/tutorial/Lesson4/CMakeLists.txt
View file

@ -91,8 +91,8 @@ target_link_libraries(ESEA es ga eo eoutils)
### 6) Configure project installation paths ### 6) Configure project installation paths
###################################################################################### ######################################################################################
install(TARGETS BitEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples) install(TARGETS BitEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples)
install(TARGETS RealEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples) install(TARGETS RealEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples)
install(TARGETS ESEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples) install(TARGETS ESEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson4 COMPONENT examples)
###################################################################################### ######################################################################################

4
eo/tutorial/Lesson5/CMakeLists.txt
View file

@ -50,7 +50,7 @@ target_link_libraries(OneMaxLibEA es ga eo eoutils)
### 6) Configure project installation paths ### 6) Configure project installation paths
###################################################################################### ######################################################################################
install(TARGETS OneMaxEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson5 COMPONENT examples) install(TARGETS OneMaxEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson5 COMPONENT examples)
install(TARGETS OneMaxLibEA RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson5 COMPONENT examples) install(TARGETS OneMaxLibEA RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson5 COMPONENT examples)
###################################################################################### ######################################################################################

4
eo/tutorial/Lesson6/CMakeLists.txt
View file

@ -45,7 +45,7 @@ target_link_libraries(RealPSO eo eoutils)
### 6) Configure project installation paths ### 6) Configure project installation paths
###################################################################################### ######################################################################################
install(TARGETS BinaryPSO RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson6 COMPONENT examples) install(TARGETS BinaryPSO RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson6 COMPONENT examples)
install(TARGETS RealPSO RUNTIME DESTINATION local/share${INSTALL_SUB_DIR}/eo/examples/Lesson6 COMPONENT examples) install(TARGETS RealPSO RUNTIME DESTINATION share${INSTALL_SUB_DIR}/eo/examples/Lesson6 COMPONENT examples)
###################################################################################### ######################################################################################