OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +03:00
Code Activity

0027514: Configuration, CMake - relative paths are not correctly handled for INSTALL_DIR

Browse Source 
Relative path can be used as INSTALL_DIR.
This commit is contained in:
ski
2016-06-15 12:29:47 +03:00
committed by apn
parent dc6ae350f3
commit d26375e22c
23 changed files with 152 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
samples/mfc/standard/01_Geometry/CMakeLists.txt
View File

@@ -70,14 +70,14 @@ add_executable (Geometry WIN32 ${Geometry_SOURCE_FILES}
set_property(TARGET Geometry PROPERTY FOLDER Samples)
if (SINGLE_GENERATOR)
install (TARGETS Geometry DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
install (TARGETS Geometry DESTINATION "${INSTALL_DIR_BIN}")
else()
install (TARGETS Geometry
CONFIGURATIONS Release RelWithDebInfo
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
DESTINATION "${INSTALL_DIR_BIN}")
install (TARGETS Geometry
CONFIGURATIONS Debug
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
DESTINATION "${INSTALL_DIR_BIN}d")
endif()
include_directories (${CMAKE_BINARY_DIR}/inc

6
samples/mfc/standard/02_Modeling/CMakeLists.txt
View File

@@ -40,14 +40,14 @@ add_executable ( Modeling WIN32 ${Modeling_SOURCE_FILES}
set_property (TARGET Modeling PROPERTY FOLDER Samples)
if (SINGLE_GENERATOR)
install (TARGETS Modeling DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
install (TARGETS Modeling DESTINATION "${INSTALL_DIR_BIN}")
else()
install (TARGETS Modeling
CONFIGURATIONS Release RelWithDebInfo
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
DESTINATION "${INSTALL_DIR_BIN}")
install (TARGETS Modeling
CONFIGURATIONS Debug
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
DESTINATION "${INSTALL_DIR_BIN}d")
endif()
include_directories (${CMAKE_BINARY_DIR}/inc

6
samples/mfc/standard/03_Viewer2d/CMakeLists.txt
View File

@@ -36,14 +36,14 @@ add_executable (Viewer2d WIN32 ${Viewer2d_SOURCE_FILES}
set_property (TARGET Viewer2d PROPERTY FOLDER Samples)
if (SINGLE_GENERATOR)
install (TARGETS Viewer2d DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
install (TARGETS Viewer2d DESTINATION "${INSTALL_DIR_BIN}")
else()
install (TARGETS Viewer2d
CONFIGURATIONS Release RelWithDebInfo
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
DESTINATION "${INSTALL_DIR_BIN}")
install (TARGETS Viewer2d
CONFIGURATIONS Debug
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
DESTINATION "${INSTALL_DIR_BIN}d")
endif()
include_directories (${CMAKE_BINARY_DIR}/inc

6
samples/mfc/standard/04_Viewer3d/CMakeLists.txt
View File

@@ -60,14 +60,14 @@ add_executable (Viewer3d WIN32 ${Viewer3d_SOURCE_FILES}
set_property (TARGET Viewer3d PROPERTY FOLDER Samples)
if (SINGLE_GENERATOR)
install (TARGETS Viewer3d DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
install (TARGETS Viewer3d DESTINATION "${INSTALL_DIR_BIN}")
else()
install (TARGETS Viewer3d
CONFIGURATIONS Release RelWithDebInfo
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
DESTINATION "${INSTALL_DIR_BIN}")
install (TARGETS Viewer3d
CONFIGURATIONS Debug
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
DESTINATION "${INSTALL_DIR_BIN}d")
endif()
include_directories (${CMAKE_BINARY_DIR}/inc

6
samples/mfc/standard/05_ImportExport/CMakeLists.txt
View File

@@ -38,14 +38,14 @@ add_executable (ImportExport WIN32 ${ImportExport_SOURCE_FILES}
set_property (TARGET ImportExport PROPERTY FOLDER Samples)
if (SINGLE_GENERATOR)
install (TARGETS ImportExport DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
install (TARGETS ImportExport DESTINATION "${INSTALL_DIR_BIN}")
else()
install (TARGETS ImportExport
CONFIGURATIONS Release RelWithDebInfo
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
DESTINATION "${INSTALL_DIR_BIN}")
install (TARGETS ImportExport
CONFIGURATIONS Debug
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
DESTINATION "${INSTALL_DIR_BIN}d")
endif()
include_directories (${CMAKE_BINARY_DIR}/inc

6
samples/mfc/standard/06_Ocaf/CMakeLists.txt
View File

@@ -52,14 +52,14 @@ add_executable (Ocaf WIN32 ${Ocaf_SOURCE_FILES}
set_property (TARGET Ocaf PROPERTY FOLDER Samples)
if (SINGLE_GENERATOR)
install (TARGETS Ocaf DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
install (TARGETS Ocaf DESTINATION "${INSTALL_DIR_BIN}")
else()
install (TARGETS Ocaf
CONFIGURATIONS Release RelWithDebInfo
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
DESTINATION "${INSTALL_DIR_BIN}")
install (TARGETS Ocaf
CONFIGURATIONS Debug
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
DESTINATION "${INSTALL_DIR_BIN}d")
endif()
include_directories (${CMAKE_BINARY_DIR}/inc

6
samples/mfc/standard/07_Triangulation/CMakeLists.txt
View File

@@ -42,14 +42,14 @@ add_executable (Triangulation WIN32 ${Triangulation_SOURCE_FILES}
set_property (TARGET Triangulation PROPERTY FOLDER Samples)
if (SINGLE_GENERATOR)
install (TARGETS Triangulation DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
install (TARGETS Triangulation DESTINATION "${INSTALL_DIR_BIN}")
else()
install (TARGETS Triangulation
CONFIGURATIONS Release RelWithDebInfo
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
DESTINATION "${INSTALL_DIR_BIN}")
install (TARGETS Triangulation
CONFIGURATIONS Debug
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
DESTINATION "${INSTALL_DIR_BIN}d")
endif()
include_directories (${CMAKE_BINARY_DIR}/inc

6
samples/mfc/standard/08_HLR/CMakeLists.txt
View File

@@ -64,14 +64,14 @@ add_executable (HLR WIN32 ${HLR_SOURCE_FILES}
set_property (TARGET HLR PROPERTY FOLDER Samples)
if (SINGLE_GENERATOR)
install (TARGETS HLR DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
install (TARGETS HLR DESTINATION "${INSTALL_DIR_BIN}")
else()
install (TARGETS HLR
CONFIGURATIONS Release RelWithDebInfo
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
DESTINATION "${INSTALL_DIR_BIN}")
install (TARGETS HLR
CONFIGURATIONS Debug
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
DESTINATION "${INSTALL_DIR_BIN}d")
endif()
include_directories (${CMAKE_BINARY_DIR}/inc

6
samples/mfc/standard/09_Animation/CMakeLists.txt
View File

@@ -47,14 +47,14 @@ add_executable (Animation WIN32 ${Animation_SOURCE_FILES}
set_property (TARGET Animation PROPERTY FOLDER Samples)
if (SINGLE_GENERATOR)
install (TARGETS Animation DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
install (TARGETS Animation DESTINATION "${INSTALL_DIR_BIN}")
else()
install (TARGETS Animation
CONFIGURATIONS Release RelWithDebInfo
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
DESTINATION "${INSTALL_DIR_BIN}")
install (TARGETS Animation
CONFIGURATIONS Debug
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
DESTINATION "${INSTALL_DIR_BIN}d")
endif()
include_directories (${CMAKE_BINARY_DIR}/inc

6
samples/mfc/standard/10_Convert/CMakeLists.txt
View File

@@ -64,14 +64,14 @@ add_executable (Convert WIN32 ${Convert_SOURCE_FILES}
set_property (TARGET Convert PROPERTY FOLDER Samples)
if (SINGLE_GENERATOR)
install (TARGETS Convert DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
install (TARGETS Convert DESTINATION "${INSTALL_DIR_BIN}")
else()
install (TARGETS Convert
CONFIGURATIONS Release RelWithDebInfo
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}")
DESTINATION "${INSTALL_DIR_BIN}")
install (TARGETS Convert
CONFIGURATIONS Debug
DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d")
DESTINATION "${INSTALL_DIR_BIN}d")
endif()
include_directories (${CMAKE_BINARY_DIR}/inc

18
samples/mfc/standard/mfcsample/CMakeLists.txt
View File

@@ -140,20 +140,20 @@ set_property (TARGET mfcsample PROPERTY FOLDER Samples)
if (SINGLE_GENERATOR)
install (TARGETS mfcsample
RUNTIME DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}"
ARCHIVE DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
LIBRARY DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
RUNTIME DESTINATION "${INSTALL_DIR_BIN}"
ARCHIVE DESTINATION "${INSTALL_DIR_LIB}"
LIBRARY DESTINATION "${INSTALL_DIR_LIB}")
else()
install (TARGETS mfcsample
CONFIGURATIONS Release RelWithDebInfo
RUNTIME DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}"
ARCHIVE DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}"
LIBRARY DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}")
RUNTIME DESTINATION "${INSTALL_DIR_BIN}"
ARCHIVE DESTINATION "${INSTALL_DIR_LIB}"
LIBRARY DESTINATION "${INSTALL_DIR_LIB}")
install (TARGETS mfcsample
CONFIGURATIONS Debug
RUNTIME DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_BIN}d"
ARCHIVE DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d"
LIBRARY DESTINATION "${INSTALL_DIR}/${INSTALL_DIR_LIB}d")
RUNTIME DESTINATION "${INSTALL_DIR_BIN}d"
ARCHIVE DESTINATION "${INSTALL_DIR_LIB}d"
LIBRARY DESTINATION "${INSTALL_DIR_LIB}d")
endif()
include_directories( ${CMAKE_BINARY_DIR}/inc