cmake: put all runtime to bin when compiling

The most it is need for windows where no rpath and all dll's must be
in the same dir (or in PATH environment)

CMakeLists.txt

@@ -136,6 +136,7 @@ set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
 
 set(qca_INCLUDEDIR "${CMAKE_CURRENT_SOURCE_DIR}/include" )
 
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" )
 # Use the same path for shared and static library
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" )
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" )

cmake/modules/QcaMacro.cmake

@@ -92,3 +92,11 @@ macro(target_link_qca_test_libraries TARGET)
   target_link_qca_libraries(${TARGET})
   target_link_libraries(${TARGET} ${QT_QTTEST_LIBRARY})
 endmacro(target_link_qca_test_libraries)
+
+# it used to build unittests
+macro(add_qca_test TARGET DESCRIPTION)
+  message("${TARGET} : ${DESCRIPTION} : ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${TARGET}")
+  add_test(NAME "${DESCRIPTION}"
+           WORKING_DIRECTORY "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
+           COMMAND "${TARGET}")
+endmacro(add_qca_test)

tools/mozcerts/CMakeLists.txt

@@ -1,7 +1,6 @@
 project(mozcerts)
 
 set(mozcerts_bin_SRCS main.cpp)  
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 add_executable(${MOZCERTS_NAME} ${mozcerts_bin_SRCS})
 

tools/qcatool/CMakeLists.txt

@@ -1,7 +1,6 @@
 project(qcatool)
 
 set(qcatool_moc_SRCS main.cpp)
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin")
 
 MY_AUTOMOC( qcatool_moc_SRCS )
 

unittest/base64unittest/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable(base64unittest ${base64unittest_bin_SRCS} )
 
 target_link_qca_test_libraries(base64unittest)
 
-ADD_TEST(Base64 ${EXECUTABLE_OUTPUT_PATH}/base64unittest)
+add_qca_test(base64unittest "Base64")

unittest/bigintunittest/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable(bigintunittest ${bigintunittest_bin_SRCS} )
 
 target_link_qca_test_libraries(bigintunittest)
 
-ADD_TEST("BigInteger" ${EXECUTABLE_OUTPUT_PATH}/bigintunittest)
+add_qca_test(bigintunittest "BigInteger")

unittest/certunittest/CMakeLists.txt

@@ -14,7 +14,7 @@ FOREACH( testFileName RootCAcert.pem 76.pem altname.pem csr1.pem
 	 Server.pem QcaTestServerCert.pem xmppcert.pem newreq.pem
 	 QualitySSLIntermediateCA.crt QcaTestRootCert.pem Test_CRL.crl
 	 RAIZ2007_CERTIFICATE_AND_CRL_SIGNING_SHA256.crt )
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/certs/${testFileName} ${CMAKE_CURRENT_BINARY_DIR}/certs/${testFileName} COPYONLY)
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/certs/${testFileName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/certs/${testFileName} COPYONLY)
 ENDFOREACH( testFileName )
 
-ADD_TEST(Certificate ${EXECUTABLE_OUTPUT_PATH}/certunittest)
+add_qca_test(certunittest "Certificate")

unittest/cipherunittest/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable(cipherunittest ${cipherunittest_bin_SRCS} )
 
 target_link_qca_test_libraries(cipherunittest)
 
-ADD_TEST( SymmetricCipher ${EXECUTABLE_OUTPUT_PATH}/cipherunittest)
+add_qca_test(cipherunittest "SymmetricCipher")

unittest/clientplugin/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable(clientplugin ${clientplugin_bin_SRCS} )
 
 target_link_qca_test_libraries(clientplugin)
 
-ADD_TEST(ClientSidePlugin ${EXECUTABLE_OUTPUT_PATH}/clientplugin)
+add_qca_test(clientplugin "ClientSidePlugin")

unittest/cms/CMakeLists.txt

@@ -9,7 +9,7 @@ add_executable(cms ${cms_bin_SRCS} )
 target_link_qca_test_libraries(cms)
 
 FOREACH( testFileName QcaTestRootCert.pem QcaTestClientCert.pem  QcaTestClientKey.pem )
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${testFileName} ${CMAKE_CURRENT_BINARY_DIR}/${testFileName} COPYONLY)
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${testFileName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${testFileName} COPYONLY)
 ENDFOREACH( testFileName )
 
-ADD_TEST(CryptographicMessageSyntax ${EXECUTABLE_OUTPUT_PATH}/cms)
+add_qca_test(cms "CryptographicMessageSyntax")

unittest/dsaunittest/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable( dsaunittest ${dsaunittest_bin_SRCS} )
 
 target_link_qca_test_libraries(dsaunittest)
 
-ADD_TEST(DigitalSignatureAlgorithm ${EXECUTABLE_OUTPUT_PATH}/dsaunittest)
+add_qca_test(dsaunittest "DigitalSignatureAlgorithm")

unittest/filewatchunittest/CMakeLists.txt

@@ -7,4 +7,4 @@ add_executable( filewatchunittest ${SOURCES})
 
 target_link_qca_test_libraries(filewatchunittest)
 
-ADD_TEST(FileWatch ${EXECUTABLE_OUTPUT_PATH}/filewatchunittest)
+add_qca_test(filewatchunittest "FileWatch")

unittest/hashunittest/CMakeLists.txt

@@ -9,8 +9,8 @@ add_executable( hashunittest ${hashunittest_bin_SRCS} )
 target_link_qca_test_libraries(hashunittest)
 
 
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/empty ${CMAKE_CURRENT_BINARY_DIR}/data/empty COPYONLY)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/twobytes ${CMAKE_CURRENT_BINARY_DIR}/data/twobytes COPYONLY)
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/twohundredbytes ${CMAKE_CURRENT_BINARY_DIR}/data/twohundredbytes COPYONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/empty ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/data/empty COPYONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/twobytes ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/data/twobytes COPYONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/data/twohundredbytes ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/data/twohundredbytes COPYONLY)
 
-ADD_TEST(Hashing ${EXECUTABLE_OUTPUT_PATH}/hashunittest)
+add_qca_test(hashunittest "Hashing")

unittest/hexunittest/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable( hexunittest ${hexunittest_bin_SRCS} )
 
 target_link_qca_test_libraries(hexunittest)
 
-ADD_TEST(HexadecimalConversion ${EXECUTABLE_OUTPUT_PATH}/hexunittest)
+add_qca_test(hexunittest "HexadecimalConversion")

unittest/kdfunittest/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable( kdfunittest ${kdfunittest_bin_SRCS} )
 
 target_link_qca_test_libraries(kdfunittest)
 
-ADD_TEST(KeyDerivationFunction ${EXECUTABLE_OUTPUT_PATH}/kdfunittest)
+add_qca_test(kdfunittest "KeyDerivationFunction")

unittest/keybundle/CMakeLists.txt

@@ -10,7 +10,7 @@ target_link_qca_test_libraries(keybundle)
 
 FOREACH( testFileName RootCA2cert.pem  servergood2.p12  
 	 user2goodcert.pem  user2goodkey.pem  user2good.p12 )
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${testFileName} ${CMAKE_CURRENT_BINARY_DIR}/${testFileName} COPYONLY)
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${testFileName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${testFileName} COPYONLY)
 ENDFOREACH( testFileName )
 
-ADD_TEST(KeyBundle ${EXECUTABLE_OUTPUT_PATH}/keybundle)
+add_qca_test(keybundle "KeyBundle")

unittest/keygenunittest/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable( keygenunittest ${keygenunittest_bin_SRCS} )
 
 target_link_qca_test_libraries(keygenunittest)
 
-ADD_TEST(KeyGeneration ${EXECUTABLE_OUTPUT_PATH}/keygenunittest)
+add_qca_test(keygenunittest "KeyGeneration")

unittest/keylengthunittest/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable( keylengthunittest ${keylengthunittest_bin_SRCS} )
 
 target_link_qca_test_libraries(keylengthunittest)
 
-ADD_TEST(KeyLength ${EXECUTABLE_OUTPUT_PATH}/keylengthunittest)
+add_qca_test(keylengthunittest "KeyLength")

unittest/keystore/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable( keystore ${keystoreunittest_bin_SRCS} )
 
 target_link_qca_test_libraries(keystore)
 
-ADD_TEST(KeyStore ${EXECUTABLE_OUTPUT_PATH}/keystore)
+add_qca_test(keystore "KeyStore")

unittest/logger/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable(loggerunittest ${loggerunittest_bin_SRCS} )
 
 target_link_qca_test_libraries(loggerunittest)
 
-ADD_TEST(Logger ${EXECUTABLE_OUTPUT_PATH}/loggerunittest)
+add_qca_test(loggerunittest "Logger")

unittest/macunittest/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable( macunittest ${macunittest_bin_SRCS} )
 
 target_link_qca_test_libraries(macunittest)
 
-ADD_TEST(MessageAuthenticationCode ${EXECUTABLE_OUTPUT_PATH}/macunittest)
+add_qca_test(macunittest "MessageAuthenticationCode")

unittest/metatype/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable( metatypeunittest ${metatype_bin_SRCS} )
 
 target_link_qca_test_libraries(metatypeunittest)
 
-ADD_TEST(MetaTypeUnittest ${EXECUTABLE_OUTPUT_PATH}/metatypeunittest)
+add_qca_test(metatypeunittest "MetaTypeUnittest")

unittest/pgpunittest/CMakeLists.txt

@@ -9,20 +9,20 @@ add_executable(pgpunittest ${pgpunittest_bin_SRCS} )
 target_link_qca_test_libraries(pgpunittest)
 
 file(MAKE_DIRECTORY
-  ${CMAKE_CURRENT_BINARY_DIR}/keys1_work
-  ${CMAKE_CURRENT_BINARY_DIR}/keys2_work
-  ${CMAKE_CURRENT_BINARY_DIR}/keys3_work)
+  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/keys1_work
+  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/keys2_work
+  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/keys3_work)
 
 FOREACH( testFileName pubring.gpg secring.gpg trustdb.gpg )
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/keys1/${testFileName} ${CMAKE_CURRENT_BINARY_DIR}/keys1_work/${testFileName} COPYONLY)
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/keys1/${testFileName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/keys1_work/${testFileName} COPYONLY)
 ENDFOREACH( testFileName )
 
 FOREACH( testFileName pubring.gpg trustdb.gpg )
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/keys2/${testFileName} ${CMAKE_CURRENT_BINARY_DIR}/keys2_work/${testFileName} COPYONLY)
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/keys2/${testFileName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/keys2_work/${testFileName} COPYONLY)
 ENDFOREACH( testFileName )
 
 FOREACH( testFileName pubring.gpg secring.gpg trustdb.gpg )
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/keys3/${testFileName} ${CMAKE_CURRENT_BINARY_DIR}/keys3_work/${testFileName} COPYONLY)
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/keys3/${testFileName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/keys3_work/${testFileName} COPYONLY)
 ENDFOREACH( testFileName )
 
-ADD_TEST(PGP ${EXECUTABLE_OUTPUT_PATH}/pgpunittest)
+add_qca_test(pgpunittest "PGP")

unittest/pipeunittest/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable( pipeunittest ${pipeunittest_bin_SRCS} )
 
 target_link_qca_test_libraries(pipeunittest)
 
-# ADD_TEST(QPipe ${EXECUTABLE_OUTPUT_PATH}/pipeunittest)
+# add_qca_test(pipeunittest "QPipe")

unittest/pkits/CMakeLists.txt

@@ -31,7 +31,7 @@ FOREACH( testFileName BadnotAfterDateCACert.crt RFC3280MandatoryAttributeTypesCA
 	 NoCRLCACert.crt ValidRolloverfromPrintableStringtoUTF8StringTest10EE.crt
 	 RevokedsubCACert.crt ValidUTF8StringCaseInsensitiveMatchTest11EE.crt
 	 RevokedsubCACRL.crl ValidUTF8StringEncodedNamesTest9EE.crt RFC3280MandatoryAttributeTypesCACert.crt )
-   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/certs/${testFileName} ${CMAKE_CURRENT_BINARY_DIR}/certs/${testFileName} COPYONLY)
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/certs/${testFileName} ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/certs/${testFileName} COPYONLY)
 ENDFOREACH( testFileName )
 
-ADD_TEST(PublicKeyInfrastructure ${EXECUTABLE_OUTPUT_PATH}/pkits)
+add_qca_test(pkits "PublicKeyInfrastructure")

unittest/rsaunittest/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable(rsaunittest ${rsaunittest_bin_SRCS} )
 
 target_link_qca_test_libraries(rsaunittest)
 
-ADD_TEST(RSA ${EXECUTABLE_OUTPUT_PATH}/rsaunittest)
+add_qca_test(rsaunittest "RSA")

unittest/securearrayunittest/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable( securearrayunittest ${securearrayunittest_bin_SRCS} )
 
 target_link_qca_test_libraries(securearrayunittest)
 
-ADD_TEST(SecureArray ${EXECUTABLE_OUTPUT_PATH}/securearrayunittest)
+add_qca_test(securearrayunittest "SecureArray")

unittest/staticunittest/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable( staticunittest ${staticunittest_bin_SRCS} )
 
 target_link_qca_test_libraries(staticunittest)
 
-ADD_TEST(StaticFunctions ${EXECUTABLE_OUTPUT_PATH}/staticunittest)
+add_qca_test(staticunittest "StaticFunctions")

unittest/symmetrickeyunittest/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable( symmetrickeyunittest ${symmetrickeyunittest_bin_SRCS} )
 
 target_link_qca_test_libraries(symmetrickeyunittest)
 
-ADD_TEST(SymmetricKey ${EXECUTABLE_OUTPUT_PATH}/symmetrickeyunittest)
+add_qca_test(symmetrickeyunittest "SymmetricKey")

unittest/tls/CMakeLists.txt

@@ -8,4 +8,4 @@ add_executable(tlsunittest ${tlsunittest_bin_SRCS} )
 
 target_link_qca_test_libraries(tlsunittest)
 
-ADD_TEST(TransportLayerSecurity ${EXECUTABLE_OUTPUT_PATH}/tlsunittest)
+add_qca_test(tlsunittest "TransportLayerSecurity")

unittest/velox/CMakeLists.txt

@@ -9,7 +9,7 @@ add_executable(veloxunittest ${veloxunittest_bin_SRCS} )
 target_link_qca_test_libraries(veloxunittest)
 target_link_libraries(veloxunittest ${QT_QTNETWORK_LIBRARY})
 
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/root.crt ${CMAKE_CURRENT_BINARY_DIR}/root.crt COPYONLY)
+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/root.crt ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/root.crt COPYONLY)
 
 # this will almost always fail.
-# ADD_TEST(ServerNameIndication ${EXECUTABLE_OUTPUT_PATH}/veloxunittest)
+# add_qca_test(veloxunittest "ServerNameIndication")