Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Windows build dir fix #16

Open
wants to merge 4 commits into
base: develop
Choose a base branch
from
Open

Windows build dir fix #16

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec8fb4c
Initial commit
hsorby Dec 19, 2016
c3f0386
Mreging upstream develop
chrispbradley Jan 10, 2018
e9e81ad
Update to allow for multiple OSs under manage.
chrispbradley Nov 20, 2017
da3174b
Changing CMAKE_HOST_SYSTEM_NAME to CMAKE_SYSTEM_NAME
chrispbradley Jan 12, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ endif ()
# Everything should be valid from here onwards.
if (OPENCMISS_SETUP_TYPE STREQUAL "standard" AND NOT OPENCMISS_INDEPENDENT)
set(OPENCMISS_MANAGE_SOURCE_DIR "${OPENCMISS_ROOT}/src/manage")
set(OPENCMISS_MANAGE_BINARY_DIR "${OPENCMISS_ROOT}/build/manage${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
set(OPENCMISS_MANAGE_BINARY_DIR "${OPENCMISS_ROOT}/build/manage/${CMAKE_SYSTEM_NAME}${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
set(OPENCMISS_CMAKE_MODULES_SOURCE_DIR "${OPENCMISS_ROOT}/src/cmake_modules")
set(OPENCMISS_CMAKE_MODULES_BINARY_DIR "${OPENCMISS_ROOT}/build/cmake_modules${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
set(OPENCMISS_CMAKE_MODULE_PATH "${OPENCMISS_ROOT}/install/share/cmake/Modules")
Expand All @@ -226,13 +226,13 @@ elseif (OPENCMISS_SETUP_TYPE STREQUAL "dependencies" AND OPENCMISS_INDEPENDENT)
set(OPENCMISS_CMAKE_MODULE_PATH "${OPENCMISS_CMAKE_MODULES_ROOT}/install/share/cmake/Modules")
elseif (OPENCMISS_SETUP_TYPE STREQUAL "dependencies" AND NOT OPENCMISS_INDEPENDENT)
set(OPENCMISS_MANAGE_SOURCE_DIR "${OPENCMISS_DEPENDENCIES_ROOT}/src/manage")
set(OPENCMISS_MANAGE_BINARY_DIR "${OPENCMISS_DEPENDENCIES_ROOT}/build/manage${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
set(OPENCMISS_MANAGE_BINARY_DIR "${OPENCMISS_DEPENDENCIES_ROOT}/build/manage/${CMAKE_SYSTEM_NAME}${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
set(OPENCMISS_CMAKE_MODULES_SOURCE_DIR "${OPENCMISS_DEPENDENCIES_ROOT}/src/cmake_modules")
set(OPENCMISS_CMAKE_MODULES_BINARY_DIR "${OPENCMISS_DEPENDENCIES_ROOT}/build/cmake_modules${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
set(OPENCMISS_CMAKE_MODULE_PATH "${OPENCMISS_DEPENDENCIES_ROOT}/install/share/cmake/Modules")
elseif (OPENCMISS_SETUP_TYPE STREQUAL "libraries" AND NOT OPENCMISS_INDEPENDENT)
set(OPENCMISS_MANAGE_SOURCE_DIR "${OPENCMISS_LIBRARIES_ROOT}/src/manage")
set(OPENCMISS_MANAGE_BINARY_DIR "${OPENCMISS_LIBRARIES_ROOT}/build/manage${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
set(OPENCMISS_MANAGE_BINARY_DIR "${OPENCMISS_LIBRARIES_ROOT}/build/manage/${CMAKE_SYSTEM_NAME}${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
elseif (OPENCMISS_SETUP_TYPE STREQUAL "libraries" AND OPENCMISS_INDEPENDENT)
set(OPENCMISS_MANAGE_SOURCE_DIR "${OPENCMISS_MANAGE_ROOT}/src")
set(OPENCMISS_MANAGE_BINARY_DIR "${OPENCMISS_MANAGE_ROOT}/build${SINGLE_ARCHITECUTRE_BUILD_TYPE}")
Expand Down