always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update the way we detect the system

Browse Source
This commit is contained in:
Driss Lahlou
2017-01-12 17:51:41 +01:00
parent fb970a252d
commit 233c4ac58d
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@@ -23,14 +23,10 @@ OR_TOOLS_MINOR = 1
ifeq ($(OR_TOOLS_TOP),)
OR_ROOT =
else
ifeq "$(SHELL)" "cmd.exe"
ifeq ($(OS), Windows_NT)
OR_ROOT = $(OR_TOOLS_TOP)\\
else
ifeq "$(SHELL)" "sh.exe"
OR_ROOT = $(OR_TOOLS_TOP)\\
else
OR_ROOT = $(OR_TOOLS_TOP)/
endif
OR_ROOT = $(OR_TOOLS_TOP)/
endif
endif

9
makefiles/Makefile.port
View File

@@ -3,14 +3,10 @@ SPACE := $(empty) $(empty)
BACKSLASH_SPACE := $(empty)\ $(empty)
# Let's discover something about where we run
ifeq "$(SHELL)" "cmd.exe"
ifeq ($(OS), Windows_NT)
SYSTEM = win
else
ifeq "$(SHELL)" "sh.exe"
SYSTEM = win
else
SYSTEM = unix
endif
SYSTEM = unix
endif
# Unix specific part.
@@ -213,3 +209,4 @@ ifeq ("$(SYSTEM)","unix")
else
@echo CMAKE_PLATFORM = $(CMAKE_PLATFORM)
endif