*** empty log message ***

[creaMaracasVisu.git] / lib / maracasVisuLib / CMakeLists.txt

diff --git a/lib/maracasVisuLib/CMakeLists.txt b/lib/maracasVisuLib/CMakeLists.txt
index e6e8f014cefd3f5eb238a89856d12b3076a23118..3ec066db35bb211e13d612ca9b24e85961a29371 100644 (file)
--- a/lib/maracasVisuLib/CMakeLists.txt
+++ b/lib/maracasVisuLib/CMakeLists.txt
@@ -1,6 +1,6 @@
 #----------------------------------------------------------------------------
 # SET THE NAME OF YOUR LIBRARY
-SET ( LIBRARY_NAME   maracasVisuLib  )
+SET ( LIBRARY_NAME   creaMaracasVisu  )
 #----------------------------------------------------------------------------
 
 #----------------------------------------------------------------------------
@@ -34,7 +34,7 @@ IF ( BUILD_${LIBRARY_NAME} )
        ../../../
 )
        #message(jhcl\n\n ${crea_LIBRARIES})
-       INCLUDE(include/Modules/MARACAS_Find_LIBIDO.cmake)
+       #INCLUDE(include/Modules/MARACAS_Find_LIBIDO.cmake)
        #SET(CREA_LIBRARIES C:/creaBin/Debug/crea.lib)
        #FIND_PACKAGE(crea)
 #jhcl-End===========================================================================
@@ -209,7 +209,7 @@ IF ( BUILD_${LIBRARY_NAME} )
   CREA_MANAGE_SHARED_LIBRARY(${LIBRARY_NAME})
 
   # CREATE THE TARGET
-  ADD_LIBRARY(${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES})
+  ADD_LIBRARY(${LIBRARY_NAME} ${${LIBRARY_NAME}_SHARED} ${${LIBRARY_NAME}_SOURCES} ${${LIBRARY_NAME}_HEADERS})
 
   # LINK
   TARGET_LINK_LIBRARIES(${LIBRARY_NAME} ${${LIBRARY_NAME}_LINK_LIBRARIES})
@@ -236,15 +236,22 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS
     lib/maracasVisuLib/src/interface/wxWindows/widgets/pPlotter
        lib/maracasVisuLib/../../../
 )
+IF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+  SET(CILFC_EXECUTABLE_OUTPUT_REL_PATH ".")
+ELSE ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
+  FILE(RELATIVE_PATH 
+    CILFC_EXECUTABLE_OUTPUT_REL_PATH
+    ${PROJECT_BINARY_DIR} ${EXECUTABLE_OUTPUT_PATH})
+ENDIF ( ${PROJECT_BINARY_DIR} STREQUAL ${EXECUTABLE_OUTPUT_PATH} )
 
 IF(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS
-    ${EXECUTABLE_OUTPUT_REL_PATH})
+    ${CILFC_EXECUTABLE_OUTPUT_REL_PATH})
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
 ELSE(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS
-    ${EXECUTABLE_OUTPUT_REL_PATH}/Debug
-    ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
+    ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}/Debug
+    ${CILFC_EXECUTABLE_OUTPUT_REL_PATH}/Release)
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS bin)
 ENDIF(UNIX)
   SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/${LIBRARY_NAME})
@@ -264,7 +271,7 @@ INSTALL(
   ) 
 INSTALL(
   TARGETS ${LIBRARY_NAME}
-  DESTINATION lib)
+  DESTINATION bin )