@@ -21,13 +21,16 @@ include(ExternalProject)
21
21
include (CMakePackageConfigHelpers)
22
22
23
23
find_package (Git)
24
-
25
- if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR} /.git"
26
- AND IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR} /.git"
27
- AND Git_FOUND)
28
-
29
- # Information from git
30
- # ====================
24
+ if (DEFINED ENV{LIEF_VERSION_ENV})
25
+ string (REGEX MATCHALL "([0-9]+)" VERSION_STRING "$ENV{LIEF_VERSION_ENV} " )
26
+ if (NOT VERSION_STRING)
27
+ message (FATAL_ERROR "Invalid version" )
28
+ endif ()
29
+ list (GET VERSION_STRING 0 LIEF_VERSION_MAJOR)
30
+ list (GET VERSION_STRING 1 LIEF_VERSION_MINOR)
31
+ list (GET VERSION_STRING 2 LIEF_VERSION_PATCH)
32
+ elseif (EXISTS "${CMAKE_CURRENT_SOURCE_DIR} /.git"
33
+ AND IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR} /.git" AND Git_FOUND)
31
34
include (LIEFGit)
32
35
else ()
33
36
set (LIEF_VERSION_MAJOR "0" )
@@ -105,16 +108,12 @@ if(LIEF_INSTALL)
105
108
include (GNUInstallDirs)
106
109
set (CMAKE_INSTALL_LIBDIR "lib" )
107
110
else ()
108
- if (WIN32 )
109
- set (CMAKE_INSTALL_LIBDIR "lib" )
110
- set (CMAKE_INSTALL_DATADIR "share" )
111
- set (CMAKE_INSTALL_INCLUDEDIR "include" )
112
- set (CMAKE_INSTALL_BINDIR "bin" )
113
- set (CMAKE_INSTALL_DATAROOTDIR "share" )
114
- message (STATUS "Setting installation destination on Windows to: ${CMAKE_INSTALL_PREFIX} " )
115
- else ()
116
- message (FATAL_ERROR "System not UNIX nor WIN32 - not implemented yet" )
117
- endif ()
111
+ set (CMAKE_INSTALL_LIBDIR "lib" )
112
+ set (CMAKE_INSTALL_DATADIR "share" )
113
+ set (CMAKE_INSTALL_INCLUDEDIR "include" )
114
+ set (CMAKE_INSTALL_BINDIR "bin" )
115
+ set (CMAKE_INSTALL_DATAROOTDIR "share" )
116
+ message (STATUS "Setting installation destination to: ${CMAKE_INSTALL_PREFIX} " )
118
117
endif ()
119
118
endif ()
120
119
@@ -300,7 +299,7 @@ endif()
300
299
301
300
target_link_libraries (LIB_LIEF PRIVATE lief_spdlog)
302
301
303
- if (ANDROID AND BUILD_SHARED_LIBS AND LIEF_LOGGING)
302
+ if (ANDROID AND LIEF_LOGGING)
304
303
target_link_libraries (LIB_LIEF PUBLIC log )
305
304
endif ()
306
305
0 commit comments