- Miscellaneous CMakeLists.txt fixes.
- fixed a CMake warning about uninitialized use of the variable CROSS_EXPORTS in the tools subfolder when CMAKE_CROSSCOMPILING is off; - fixed a variable typo: CMAKE_CURRENTY_BINARY_DIR instead of CMAKE_CURRENT_BINARY_DIR; - in src/CMakeLists.txt, fixed a missing merge of a portion of code from maint branch to master.
This commit is contained in:
parent
d0e551060d
commit
d83f048858
3 changed files with 11 additions and 4 deletions
|
|
@ -595,12 +595,13 @@ else( WIN32 )
|
|||
endif( APPLE )
|
||||
endif( WIN32 )
|
||||
|
||||
if( NOT ASM_SOURCES )
|
||||
set( ASM_SOURCES "" )
|
||||
endif( NOT ASM_SOURCES )
|
||||
|
||||
if( NO_ASM )
|
||||
add_definitions( -DNOASM )
|
||||
else( NO_ASM )
|
||||
if( NOT ASM_SOURCES )
|
||||
set( ASM_SOURCES "" )
|
||||
endif( NOT ASM_SOURCES )
|
||||
if( X64 )
|
||||
ADD_ASM_FILE( asm_x86_64 tmap3 )
|
||||
else( X64 )
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue