Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Porting to OCCT 7.8.0
[modules/kernel.git]
/
src
/
Utils
/
Test
/
CMakeLists.txt
diff --git
a/src/Utils/Test/CMakeLists.txt
b/src/Utils/Test/CMakeLists.txt
old mode 100755
(executable)
new mode 100644
(file)
index
8f49727
..
08c26b9
--- a/
src/Utils/Test/CMakeLists.txt
+++ b/
src/Utils/Test/CMakeLists.txt
@@
-1,4
+1,4
@@
-# Copyright (C) 2012-20
14 CEA/DEN, EDF R&D
, OPEN CASCADE
+# Copyright (C) 2012-20
24 CEA, EDF
, OPEN CASCADE
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@@
-18,8
+18,6
@@
#
INCLUDE_DIRECTORIES(
#
INCLUDE_DIRECTORIES(
- ${PTHREAD_INCLUDE_DIR}
- ${CPPUNIT_INCLUDE_DIRS}
${CMAKE_CURRENT_SOURCE_DIR}/../../Basics
${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test
${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace
${CMAKE_CURRENT_SOURCE_DIR}/../../Basics
${CMAKE_CURRENT_SOURCE_DIR}/../../Basics/Test
${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMELocalTrace
@@
-28,6
+26,8
@@
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMETraceCollector/Test
${CMAKE_CURRENT_SOURCE_DIR}/../../Utils
${CMAKE_CURRENT_SOURCE_DIR}/../../Utils/Test
${CMAKE_CURRENT_SOURCE_DIR}/../../SALOMETraceCollector/Test
${CMAKE_CURRENT_SOURCE_DIR}/../../Utils
${CMAKE_CURRENT_SOURCE_DIR}/../../Utils/Test
+ ${PTHREAD_INCLUDE_DIR}
+ ${CPPUNIT_INCLUDE_DIRS}
)
SET(COMMON_LIBS
)
SET(COMMON_LIBS
@@
-41,16
+41,21
@@
SET(COMMON_LIBS
)
ADD_DEFINITIONS(${CPPUNIT_DEFINITIONS})
)
ADD_DEFINITIONS(${CPPUNIT_DEFINITIONS})
+SET(LOCAL_TEST_DIR ${KERNEL_TEST_DIR}/Utils)
ADD_LIBRARY(UtilsTest UtilsTest.cxx)
TARGET_LINK_LIBRARIES(UtilsTest ${COMMON_LIBS} )
ADD_LIBRARY(UtilsTest UtilsTest.cxx)
TARGET_LINK_LIBRARIES(UtilsTest ${COMMON_LIBS} )
-INSTALL(TARGETS UtilsTest DESTINATION ${
SALOME_INSTALL_LIBS
})
+INSTALL(TARGETS UtilsTest DESTINATION ${
KERNEL_TEST_LIB
})
ADD_EXECUTABLE(TestUtils TestUtils.cxx)
TARGET_LINK_LIBRARIES(TestUtils ${COMMON_LIBS} UtilsTest ${OMNIORB_LIBRARIES})
ADD_EXECUTABLE(TestUtils TestUtils.cxx)
TARGET_LINK_LIBRARIES(TestUtils ${COMMON_LIBS} UtilsTest ${OMNIORB_LIBRARIES})
-INSTALL(TARGETS TestUtils DESTINATION ${
SALOME_INSTALL_BINS
})
+INSTALL(TARGETS TestUtils DESTINATION ${
LOCAL_TEST_DIR
})
-
SALOME_INSTALL_SCRIPTS(TestUtils.py ${SALOME_INSTALL_SCRIPT_PYTHON
})
+
INSTALL(FILES TestUtils.py DESTINATION ${LOCAL_TEST_DIR
})
FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
FILE(GLOB COMMON_HEADERS_HXX "${CMAKE_CURRENT_SOURCE_DIR}/*.hxx")
-INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${SALOME_INSTALL_HEADERS})
+INSTALL(FILES ${COMMON_HEADERS_HXX} DESTINATION ${LOCAL_TEST_DIR})
+
+INSTALL(FILES CTestTestfileInstall.cmake
+ DESTINATION ${LOCAL_TEST_DIR}
+ RENAME CTestTestfile.cmake)
\ No newline at end of file