Dynamitos/Seele
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing slang on windows build

Browse Source
This commit is contained in:
Dynamitos
2020-03-25 21:29:43 +01:00
parent 018a3a8974
commit b3ad5bc573
3 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
-10
View File
@@ -15,16 +15,6 @@ set(CMAKE_BINARY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin/${CMAKE_BUILD_TYPE})
set(RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) set(RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}) set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR})
# Configuration types
SET(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Configs" FORCE)
IF(DEFINED CMAKE_BUILD_TYPE AND CMAKE_VERSION VERSION_GREATER "2.8")
SET_PROPERTY(CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS ${CMAKE_CONFIGURATION_TYPES})
ENDIF()
SET(CMAKE_ARCHITECTURES "x86;x64" CACHE STRING "Architectures" FORCE)
IF(DEFINED CMAKE_GENERATOR_PLATFORM AND CMAKE_VERSION VERSION_GREATER "2.8")
SET_PROPERTY(CACHE CMAKE_GENERATOR_PLATFORM PROPERTY STRINGS ${CMAKE_ARCHITECTURES})
ENDIF()
set(Boost_USE_STATIC_LIBS ON) set(Boost_USE_STATIC_LIBS ON)
set(Boost_LIB_PREFIX lib) set(Boost_LIB_PREFIX lib)
cmake-variants.json
+6 -2
View File
@@ -22,12 +22,16 @@
"x64": { "x64": {
"short": "x64", "short": "x64",
"long": "amd64 platform", "long": "amd64 platform",
"CMAKE_GENERATOR_PLATFORM": "x64" "settings": {
"CMAKE_PLATFORM": "x64"
}
}, },
"x86": { "x86": {
"short": "x86", "short": "x86",
"long": "x86 platform", "long": "x86 platform",
"CMAKE_GENERATOR_PLATFORM": "x86" "settings": {
"CMAKE_PLATFORM": "x86"
}
} }
} }
} }
cmake/SuperBuild.cmake
+9 -10
View File
@@ -5,7 +5,7 @@ set_property(DIRECTORY PROPERTY EP_BASE external)
set(DEPENDENCIES) set(DEPENDENCIES)
set(EXTRA_CMAKE_ARGS) set(EXTRA_CMAKE_ARGS)
set(DEPENDENT_BINARIES "") set(DEPENDENT_BINARIES "")
execute_process(COMMAND git submodule update --init --recursive -- ${CMAKE_SOURCE_DIR}) #execute_process(COMMAND git submodule update --init --recursive -- ${CMAKE_SOURCE_DIR})
#-------------BOOST---------------- #-------------BOOST----------------
list(APPEND DEPENDENCIES boost) list(APPEND DEPENDENCIES boost)
@@ -62,22 +62,21 @@ ExternalProject_Add(slang
BINARY_DIR ${CMAKE_BINARY_DIR}/lib BINARY_DIR ${CMAKE_BINARY_DIR}/lib
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND devenv /upgrade ${SLANG_ROOT}/source/slang/slang.vcxproj BUILD_COMMAND devenv /upgrade ${SLANG_ROOT}/source/slang/slang.vcxproj
COMMAND msbuild -m /p:WindowsTargetPlatformVersion=10.0 ${SLANG_ROOT}/source/slang/slang.vcxproj COMMAND msbuild -p:Configuration=${CMAKE_BUILD_TYPE} -p:Platform=${CMAKE_PLATFORM} -p:WindowsTargetPlatformVersion=10.0 ${SLANG_ROOT}/source/slang/slang.vcxproj
INSTALL_COMMAND "") INSTALL_COMMAND "")
string(TOLOWER bin/windows-${CMAKE_PLATFORM}/${CMAKE_BUILD_TYPE}/slang.dll SLANG_BINARY)
string(TOLOWER bin/windows-${CMAKE_PLATFORM}/${CMAKE_BUILD_TYPE}/slang.lib SLANG_LIB_PATH)
set(SLANG_LIB_PATH ${SLANG_ROOT}/${SLANG_LIB_PATH})
elseif(UNIX) elseif(UNIX)
ExternalProject_Add(slang ExternalProject_Add(slang
SOURCE_DIR ${SLANG_ROOT} SOURCE_DIR ${SLANG_ROOT}
BINARY_DIR ${CMAKE_BINARY_DIR}/lib BINARY_DIR ${CMAKE_BINARY_DIR}/lib
CONFIGURE_COMMAND "" CONFIGURE_COMMAND ""
BUILD_COMMAND premake5 config=${CMAKE_BUILD_TYPE}_${CMAKE_GENERATOR_PLATFORM} BUILD_COMMAND premake5 config=${CMAKE_BUILD_TYPE}_${CMAKE_PLATFORM}
INSTALL_COMMAND "") INSTALL_COMMAND "")
endif()
if(WIN32) string(TOLOWER bin/linux-${CMAKE_PLATFORM}/${CMAKE_BUILD_TYPE}/libslang.so SLANG_BINARY)
string(TOLOWER bin/windows-${CMAKE_GENERATOR_PLATFORM}/${CMAKE_BUILD_TYPE}/slang.dll SLANG_BINARY)
string(TOLOWER bin/windows-${CMAKE_GENERATOR_PLATFORM}/${CMAKE_BUILD_TYPE}/slang.lib SLANG_LIB_PATH)
set(SLANG_LIB_PATH ${SLANG_ROOT}/${SLANG_LIB_PATH})
elseif(UNIX)
string(TOLOWER bin/linux-${CMAKE_GENERATOR_PLATFORM}/${CMAKE_BUILD_TYPE}/libslang.so SLANG_BINARY)
set(SLANG_LIB_PATH) set(SLANG_LIB_PATH)
endif() endif()