Bug fix in install library on windows

[crea.git] / install / CMakeLists.txt

diff --git a/install/CMakeLists.txt b/install/CMakeLists.txt
index f38a4b6bf12fce37439cbc60f98704c13daa3bd1..3d5e8a225384eb1de18f7f8c227c3285bed2e51b 100644 (file)
--- a/install/CMakeLists.txt
+++ b/install/CMakeLists.txt
@@ -21,15 +21,16 @@ SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_INCLUDE_PATHS src)
 
 IF(UNIX)
   SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
-    ${EXECUTABLE_OUTPUT_REL_PATH})
+    .) # ${EXECUTABLE_OUTPUT_REL_PATH})
 ELSE(UNIX)
-  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS 
-    ${EXECUTABLE_OUTPUT_REL_PATH}/Debug
-    ${EXECUTABLE_OUTPUT_REL_PATH}/Release)
+  SET(${LIBRARY_NAME}_BUILD_TREE_RELATIVE_LIBRARY_PATHS
+     .    )
+#    Debug
+#    Release)
 ENDIF(UNIX)
 
 SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_INCLUDE_PATHS include/crea)
-SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS lib)
+SET(${LIBRARY_NAME}_INSTALL_TREE_RELATIVE_LIBRARY_PATHS ${CREA_LIB_PATH})
 
 # OPTIONAL 
 # - Set the version of your library
@@ -71,7 +72,7 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE.txt")
 SET(CPACK_PACKAGE_VERSION_MAJOR ${crea_MAJOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_MINOR ${crea_MINOR_VERSION})
 SET(CPACK_PACKAGE_VERSION_PATCH ${crea_BUILD_VERSION})
-SET(CPACK_PACKAGE_INSTALL_DIRECTORY "crea-${crea_MAJOR_VERSION}.${crea_MINOR_VERSION}.${crea_BUILD_VERSION}")
+SET(CPACK_PACKAGE_INSTALL_DIRECTORY "CreaTools\\\\crea-${crea_MAJOR_VERSION}.${crea_MINOR_VERSION}.${crea_BUILD_VERSION}")
 IF(WIN32 AND NOT UNIX)
   # There is a bug in NSI that does not handle full unix paths properly. Make
   # sure there is at least one set of four (4) backlasshes.
@@ -91,49 +92,3 @@ SET(CPACK_PACKAGE_EXECUTABLES "creaNewProject" "New project")
 
 INCLUDE(CPack)
 
-
-# Aditional INSTALL for CPACK mecanism.
-
-IF(EXWIN32)
-
-OPTION(BBTK_STANDALONE_INSTALLER "Install and add to installer all dlls needed, including from external toolkits (wx,itk,vtk)?" OFF)
-
-IF(BBTK_STANDALONE_INSTALLER)
-  STRING(REGEX REPLACE "\\\\" "/" WINDIR "$ENV{WINDIR}")
-  INSTALL(   FILES ${WINDIR}/system32/msvcp71d.dll                             DESTINATION bin/ )
-  INSTALL(   FILES ${WINDIR}/system32/msvcr71d.dll                             DESTINATION bin/ )
-
-  IF(USE_VTK)
-    SET(VTK_BIN_DIR ${VTK_DIR}/../../bin )
-
-    FILE(GLOB LST_FILE_VTKDLL "${VTK_BIN_DIR}/*.dll")
-    FOREACH( iLST  ${LST_FILE_VTKDLL} )
-       INSTALL( 
-         FILES ${iLST}
-         DESTINATION bin/
-       )
-    ENDFOREACH(iLST)
-  ENDIF(USE_VTK)
-    
-  IF(USE_ITK)
-    INSTALL(   FILES ${ITK_DIR}/bin/ITKCommon.dll      DESTINATION bin/ )
-  ENDIF(USE_ITK)
-
-  IF(USE_WXWIDGETS)
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_xrc_vc_custom.dll                       DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_richtext_vc_custom.dll          DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_qa_vc_custom.dll                                DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_media_vc_custom.dll             DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_html_vc_custom.dll              DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_gl_vc_custom.dll                                DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_core_vc_custom.dll              DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_aui_vc_custom.dll                       DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxmsw28d_adv_vc_custom.dll                       DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_xml_vc_custom.dll              DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_vc_custom.dll                          DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_odbc_vc_custom.dll             DESTINATION bin/ )
-    INSTALL(   FILES ${WXWIDGETS_ROOT_DIR}/lib/vc_dll/wxbase28d_net_vc_custom.dll                      DESTINATION bin/ )
-  ENDIF(USE_WXWIDGETS)
-ENDIF(BBTK_STANDALONE_INSTALLER)
-
-ENDIF(EXWIN32)