Compare commits
7 Commits
f33d06b873
...
release-d2
Author | SHA1 | Date | |
---|---|---|---|
a863bfc181 | |||
a75c4a11d3 | |||
347a165762 | |||
fd64bfae13 | |||
aaeec20ac9 | |||
37030f9c11 | |||
462f2bca4c |
14
deps/nfde/CMakeLists.txt
vendored
14
deps/nfde/CMakeLists.txt
vendored
@@ -10,7 +10,11 @@ if(NOT DEFINED BUILD_SHARED_LIBS)
|
|||||||
option(BUILD_SHARED_LIBS "Build a shared library instead of static" OFF)
|
option(BUILD_SHARED_LIBS "Build a shared library instead of static" OFF)
|
||||||
endif()
|
endif()
|
||||||
option(NFD_BUILD_TESTS "Build tests for nfd" ${nfd_ROOT_PROJECT})
|
option(NFD_BUILD_TESTS "Build tests for nfd" ${nfd_ROOT_PROJECT})
|
||||||
option(NFD_INSTALL "Generate install target for nfd" ${nfd_ROOT_PROJECT})
|
# DrinkingTea: begin
|
||||||
|
if(NOT DEFINED NFD_INSTALL)
|
||||||
|
option(NFD_INSTALL "Generate install target for nfd" ${nfd_ROOT_PROJECT})
|
||||||
|
endif()
|
||||||
|
# DrinkingTea: end
|
||||||
|
|
||||||
set(nfd_PLATFORM Undefined)
|
set(nfd_PLATFORM Undefined)
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
@@ -21,7 +25,9 @@ elseif(UNIX AND NOT APPLE)
|
|||||||
set(nfd_PLATFORM PLATFORM_UNIX)
|
set(nfd_PLATFORM PLATFORM_UNIX)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
message("nfd Platform: ${nfd_PLATFORM}")
|
# DrinkingTea: begin
|
||||||
|
#message("nfd Platform: ${nfd_PLATFORM}")
|
||||||
|
# DrinkingTea: end
|
||||||
|
|
||||||
set(nfd_COMPILER Undefined)
|
set(nfd_COMPILER Undefined)
|
||||||
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")
|
||||||
@@ -33,7 +39,9 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "C
|
|||||||
set(nfd_COMPILER COMPILER_GNU)
|
set(nfd_COMPILER COMPILER_GNU)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
message("nfd Compiler: ${nfd_COMPILER}")
|
# DrinkingTea: begin
|
||||||
|
#message("nfd Compiler: ${nfd_COMPILER}")
|
||||||
|
# DrinkingTea: end
|
||||||
|
|
||||||
# Use latest C++ by default (should be the best one), but let user override it
|
# Use latest C++ by default (should be the best one), but let user override it
|
||||||
if(NOT DEFINED CMAKE_CXX_STANDARD)
|
if(NOT DEFINED CMAKE_CXX_STANDARD)
|
||||||
|
@@ -11,7 +11,7 @@ target_link_libraries(
|
|||||||
|
|
||||||
target_compile_definitions(
|
target_compile_definitions(
|
||||||
NostalgiaStudio PUBLIC
|
NostalgiaStudio PUBLIC
|
||||||
OLYMPIC_APP_VERSION="dev build"
|
OLYMPIC_APP_VERSION="d2024.12.0"
|
||||||
)
|
)
|
||||||
|
|
||||||
install(
|
install(
|
||||||
|
Reference in New Issue
Block a user