Skip to content
Snippets Groups Projects
Commit bef56703 authored by Andreas Schenk's avatar Andreas Schenk
Browse files

setting CMAKE_RUNTIME_OUTPUT_DIRECTORY for RELEASE and DEBUG builds to 

avoid additional Release and Debug directories
switched from deprrecated EXECUTABLE_OUTPUT_PATH to
CMAKE_RUNTIME_OUTPUT_DIRECTORY
deactivated unit test running for windows, as it is broken
parent 2236db70
Branches master
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
cmake_support/OST.cmake
+ 36
− 26
View file @ bef56703
...@@ -192,12 +192,12 @@ macro(module) ...@@ -192,12 +192,12 @@ macro(module)
# create library # create library
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
file(MAKE_DIRECTORY ${LIB_STAGE_PATH}) file(MAKE_DIRECTORY ${LIB_STAGE_PATH})
file(MAKE_DIRECTORY ${EXECUTABLE_OUTPUT_PATH}) file(MAKE_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
file(MAKE_DIRECTORY ${LIBEXEC_STAGE_PATH}) file(MAKE_DIRECTORY ${LIBEXEC_STAGE_PATH})
file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/tests") file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/tests")
if (NOT TARGET create_stage) if (NOT TARGET create_stage)
add_custom_target(create_stage COMMAND ${CMAKE_COMMAND} -E make_directory ${LIB_STAGE_PATH} add_custom_target(create_stage COMMAND ${CMAKE_COMMAND} -E make_directory ${LIB_STAGE_PATH}
COMMAND ${CMAKE_COMMAND} -E make_directory ${EXECUTABLE_OUTPUT_PATH} COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}
COMMAND ${CMAKE_COMMAND} -E make_directory ${LIBEXEC_STAGE_PATH} COMMAND ${CMAKE_COMMAND} -E make_directory ${LIBEXEC_STAGE_PATH}
COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/tests") COMMAND ${CMAKE_COMMAND} -E make_directory "${CMAKE_BINARY_DIR}/tests")
endif() endif()
...@@ -545,7 +545,11 @@ macro(pymod) ...@@ -545,7 +545,11 @@ macro(pymod)
set_target_properties("_${_LIB_NAME}" set_target_properties("_${_LIB_NAME}"
PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PYMOD_STAGE_DIR}) PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PYMOD_STAGE_DIR})
set_target_properties("_${_LIB_NAME}"
PROPERTIES LIBRARY_OUTPUT_DIRECTORY_RELEASE ${PYMOD_STAGE_DIR})
set_target_properties("_${_LIB_NAME}"
PROPERTIES LIBRARY_OUTPUT_DIRECTORY_DEBUG ${PYMOD_STAGE_DIR})
if (NOT ENABLE_STATIC) if (NOT ENABLE_STATIC)
if (_USE_RPATH) if (_USE_RPATH)
string(REGEX REPLACE "/[^/]*" "/.." inv_pymod_path "/${PYMOD_DIR}") string(REGEX REPLACE "/[^/]*" "/.." inv_pymod_path "/${PYMOD_DIR}")
...@@ -651,14 +655,20 @@ macro(ost_unittest) ...@@ -651,14 +655,20 @@ macro(ost_unittest)
else() else()
add_executable(${_test_name} EXCLUDE_FROM_ALL ${_SOURCES}) add_executable(${_test_name} EXCLUDE_FROM_ALL ${_SOURCES})
endif() endif()
set_target_properties(${_test_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/tests" )
set_target_properties(${_test_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/tests" )
set_target_properties(${_test_name} PROPERTIES RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/tests" )
if (WIN32) if (WIN32)
target_link_libraries(${_test_name} ${BOOST_UNIT_TEST_LIBRARIES} "${_ARG_PREFIX}_${_ARG_MODULE}") target_link_libraries(${_test_name} ${BOOST_UNIT_TEST_LIBRARIES} "${_ARG_PREFIX}_${_ARG_MODULE}")
add_custom_target("${_test_name}_run": #add_custom_target("${_test_name}_run":
COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${_test_name}.exe || echo # COMMAND ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${_test_name}.exe || echo
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/.. # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_BUILD_TYPE}/..
COMMENT "running checks for module ${_ARG_MODULE}" # COMMENT "running checks for module ${_ARG_MODULE}"
DEPENDS ${_test_name}) # DEPENDS ${_test_name})
add_test("${_test_name}" ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${_test_name}.exe) #add_test("${_test_name}" ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_BUILD_TYPE}/${_test_name}.exe)
#set_target_properties("${_test_name}_run" PROPERTIES EXCLUDE_FROM_ALL "1")
#add_dependencies(check "${_test_name}_run")
else() else()
target_link_libraries(${_test_name} ${BOOST_UNIT_TEST_LIBRARIES} target_link_libraries(${_test_name} ${BOOST_UNIT_TEST_LIBRARIES}
"${_ARG_PREFIX}_${_ARG_MODULE}") "${_ARG_PREFIX}_${_ARG_MODULE}")
...@@ -674,28 +684,29 @@ macro(ost_unittest) ...@@ -674,28 +684,29 @@ macro(ost_unittest)
DEPENDS ${_test_name}) DEPENDS ${_test_name})
add_test("${_test_name}" ${CMAKE_CURRENT_BINARY_DIR}/${_test_name} ) add_test("${_test_name}" ${CMAKE_CURRENT_BINARY_DIR}/${_test_name} )
add_dependencies(check_xml "${_test_name}_run_xml") add_dependencies(check_xml "${_test_name}_run_xml")
add_dependencies(check "${_test_name}_run")
endif() endif()
if (_ARG_LINK) if (_ARG_LINK)
target_link_libraries("${_test_name}" ${_ARG_LINK}) target_link_libraries("${_test_name}" ${_ARG_LINK})
endif() endif()
add_dependencies(check "${_test_name}_run")
set_target_properties(${_test_name} set_target_properties(${_test_name}
PROPERTIES RUNTIME_OUTPUT_DIRECTORY PROPERTIES RUNTIME_OUTPUT_DIRECTORY
"${CMAKE_CURRENT_BINARY_DIR}") "${CMAKE_CURRENT_BINARY_DIR}")
if (WIN32)
set_target_properties("${_test_name}_run" PROPERTIES EXCLUDE_FROM_ALL "1")
endif()
endif() endif()
foreach(py_test ${PY_TESTS}) foreach(py_test ${PY_TESTS})
if(WIN32) if(WIN32)
set (PY_TESTS_CMD "${PYTHON_BINARY}") # todo fix python unit test running for Windows
add_custom_target("${py_test}_run" #set (PY_TESTS_CMD "${EXECUTABLE_OUTPUT_PATH}/ost.bat")
CALL "${PY_TESTS_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/${py_test} || echo" #add_custom_target("${py_test}_run"
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} # CALL "${PY_TESTS_CMD} ${CMAKE_CURRENT_SOURCE_DIR}/${py_test} || echo"
COMMENT "running checks ${py_test}" VERBATIM) # WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
# COMMENT "running checks ${py_test}" VERBATIM)
#set_target_properties("${py_test}_run" PROPERTIES EXCLUDE_FROM_ALL "1")
#add_dependencies("${py_test}_run" ost_scripts "_${_ARG_PREFIX}_${_ARG_MODULE}")
#add_dependencies(check "${py_test}_run")
else() else()
set(python_path $ENV{PYTHONPATH}) set(python_path $ENV{PYTHONPATH})
if(python_path) if(python_path)
...@@ -712,12 +723,9 @@ macro(ost_unittest) ...@@ -712,12 +723,9 @@ macro(ost_unittest)
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
COMMENT "running checks ${py_test}" VERBATIM) COMMENT "running checks ${py_test}" VERBATIM)
add_dependencies("${py_test}_run_xml" ost_scripts "_${_ARG_PREFIX}_${_ARG_MODULE}") add_dependencies("${py_test}_run_xml" ost_scripts "_${_ARG_PREFIX}_${_ARG_MODULE}")
endif() add_dependencies("${py_test}_run" ost_scripts "_${_ARG_PREFIX}_${_ARG_MODULE}")
add_dependencies("${py_test}_run" ost_scripts "_${_ARG_PREFIX}_${_ARG_MODULE}") add_dependencies(check "${py_test}_run")
add_dependencies(check "${py_test}_run") add_dependencies(check_xml "${py_test}_run_xml")
add_dependencies(check_xml "${py_test}_run_xml")
if (WIN32)
set_target_properties("${py_test}_run" PROPERTIES EXCLUDE_FROM_ALL "1")
endif() endif()
endforeach() endforeach()
...@@ -808,7 +816,9 @@ endmacro() ...@@ -808,7 +816,9 @@ endmacro()
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
macro(setup_stage) macro(setup_stage)
set(STAGE_DIR "${CMAKE_BINARY_DIR}/stage") set(STAGE_DIR "${CMAKE_BINARY_DIR}/stage")
set(EXECUTABLE_OUTPUT_PATH ${STAGE_DIR}/bin ) set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${STAGE_DIR}/bin )
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG ${STAGE_DIR}/bin )
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE ${STAGE_DIR}/bin )
set(HEADER_STAGE_PATH ${STAGE_DIR}/include ) set(HEADER_STAGE_PATH ${STAGE_DIR}/include )
set(SHARED_DATA_PATH ${STAGE_DIR}/share/openstructure ) set(SHARED_DATA_PATH ${STAGE_DIR}/share/openstructure )
...@@ -861,7 +871,7 @@ macro(setup_compiler_flags) ...@@ -861,7 +871,7 @@ macro(setup_compiler_flags)
add_definitions(-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_DEPRECATE add_definitions(-D_USE_MATH_DEFINES -D_CRT_SECURE_NO_DEPRECATE
-D_SCL_SECURE_NO_DEPRECATE -DNOMINMAX) -D_SCL_SECURE_NO_DEPRECATE -DNOMINMAX)
add_definitions(-Zc:wchar_t-) # #add_definitions(-Zc:wchar_t-) #
# add_definitions(-MDd -vmg -EHsc -GR) # add_definitions(-MDd -vmg -EHsc -GR)
#GR:Uses the __fastcall calling convention (x86 only). #GR:Uses the __fastcall calling convention (x86 only).
#-EHsc to specify the synchronous exception handling mode/ #-EHsc to specify the synchronous exception handling mode/
......
modules/gui/src/gosty.cc
+ 0
− 2
View file @ bef56703
...@@ -96,8 +96,6 @@ String get_ost_root() ...@@ -96,8 +96,6 @@ String get_ost_root()
#else #else
#ifdef _MSC_VER #ifdef _MSC_VER
dir.cdUp(); dir.cdUp();
dir.cdUp();
dir.cdUp();
#else #else
dir.cdUp(); dir.cdUp();
dir.cdUp(); dir.cdUp();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment