Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
[submodule "krb5"]
path = krb5
url = https://github.com/krb5/krb5
[submodule "cmake/cnpm"]
path = cmake/cnpm
url = https://github.com/rogii-com/cnpm.git
[submodule "cmake/utils"]
path = cmake/utils
[submodule "rogii/utils"]
path = rogii/utils
url = https://github.com/rogii-com/cmake-utils.git
[submodule "rogii/npm"]
path = rogii/npm
url = https://github.com/rogii-com/cnpm.git
79 changes: 37 additions & 42 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,43 +9,51 @@ project(
C
)

include(
${PROJECT_SOURCE_DIR}/cmake/cnpm/NastyPackageManager.cmake
)

NPM_ADD_PACKAGE(
NAME
msvs
VERSION
2019.14.27.29110
BUILD_NUMBER
1
)

NPM_ADD_PACKAGE(
NAME
WindowsSDK
VERSION
10.0.18362.0
BUILD_NUMBER
4
set(
ROGII_FOLDER_PATH
"${CMAKE_CURRENT_LIST_DIR}/rogii"
)
include(${ROGII_FOLDER_PATH}/npm/Include.cmake)
include(${ROGII_FOLDER_PATH}/environment.cmake)

NPM_PREPARE_PACKAGES(
CNPM_PREPARE_PACKAGES(
DEFAULT_REPOSITORY_URLS
"$ENV{CNPM_URLS}"
)

set(
OPENSSL_CONFIG_ARCH
"VC-WIN32"
)
if(WIN32)
set(
PLATFORM_MAKE_PROGRAM
"nmake"
)

if(CMAKE_SIZEOF_VOID_P EQUAL 8)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(
OPENSSL_CONFIG_ARCH
"VC-WIN64A"
)
else()
set(
OPENSSL_CONFIG_ARCH
"VC-WIN32"
)
endif()
elseif(UNIX)
set(
OPENSSL_CONFIG_ARCH
"VC-WIN64A"
PLATFORM_MAKE_PROGRAM
"make"
)

if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(
OPENSSL_CONFIG_ARCH
"linux-x86_64"
)
else()
message(FATAL_ERROR "Unsupported arch")
endif()
else()
message(FATAL_ERROR "Unsupported platform")
endif()

add_custom_command(
Expand Down Expand Up @@ -84,24 +92,11 @@ add_custom_command(
add_custom_target(
build_target
COMMAND
${CMAKE_COMMAND}
-E
env
LIBS=apps\\libapps.lib
${CMAKE_MAKE_PROGRAM}
/E
install_sw
COMMAND
${CMAKE_COMMAND}
-E
copy
${PROJECT_SOURCE_DIR}/cmake/package.cmake
${CMAKE_INSTALL_PREFIX}
${PLATFORM_MAKE_PROGRAM} install_sw
COMMENT
"Build OpenSSL."
DEPENDS
${PROJECT_BINARY_DIR}/build/configdata.pm
WORKING_DIRECTORY
${PROJECT_BINARY_DIR}/build
)

178 changes: 0 additions & 178 deletions cmake/build_common.cmake

This file was deleted.

1 change: 0 additions & 1 deletion cmake/cnpm
Submodule cnpm deleted from f8316c
1 change: 0 additions & 1 deletion cmake/utils
Submodule utils deleted from 6c689a
8 changes: 8 additions & 0 deletions rogii/build/windows/jenkins_env/generate_setup_msvs_env.cmake
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
include(
${CMAKE_CURRENT_LIST_DIR}/../../../msvs_versions.cmake
)

configure_file(
${CMAKE_CURRENT_LIST_DIR}/template__setup_msvs_env.bat
setup_msvs_env.bat
)
6 changes: 6 additions & 0 deletions rogii/build/windows/jenkins_env/template__setup_msvs_env.bat
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
if not exist "%BUILD_ENV_SCRIPTS_PATH%" (
echo "Environment scripts directory does not exist. BUILD_ENV_SCRIPTS_PATH = %BUILD_ENV_SCRIPTS_PATH%"
exit /B 1
)

call "%BUILD_ENV_SCRIPTS_PATH%\vs_sdk.bat" %1 ${MSVS_YEAR_VERSION} ${MSVS_SDK_VERSION} ${MSVS_VCTOOLS_VERSION}
4 changes: 2 additions & 2 deletions cmake/build_amd64.cmake → rogii/build_amd64.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ message(
if(NOT DEFINED ENV{ENV_INSTALL})
message(
FATAL_ERROR
"You have to specify an install path via `ENV{ENV_INSTALL}' variable."
"You have to specify an install path via `ENV_INSTALL' variable."
)
endif()

Expand All @@ -22,5 +22,5 @@ set(
)

include(
${CMAKE_CURRENT_LIST_DIR}/build_common.cmake
"${CMAKE_CURRENT_LIST_DIR}/build_common.cmake"
)
Loading